diff --git a/io/loadthread.cpp b/io/loadthread.cpp
index 7738c23df..fae123a19 100644
--- a/io/loadthread.cpp
+++ b/io/loadthread.cpp
@@ -649,7 +649,7 @@ void LoadThread::run() {
     emit success(); // run in main thread
 
     for (int i=0;i<loaded_media_items.size();i++) {
-      PreviewGenerator* pg = new PreviewGenerator(loaded_media_items.at(i));
+      PreviewGenerator::AnalyzeMedia(loaded_media_items.at(i));
     }
   } else {
     if (error_str.isEmpty()) {
diff --git a/io/previewgenerator.cpp b/io/previewgenerator.cpp
index 7911b904b..b5f0a94ef 100644
--- a/io/previewgenerator.cpp
+++ b/io/previewgenerator.cpp
@@ -593,3 +593,11 @@ void PreviewGenerator::cancel() {
   cancelled_ = true;
   wait();
 }
+
+void PreviewGenerator::AnalyzeMedia(Media *m)
+{
+  // PreviewGenerator's constructor starts the thread, sets a reference of itself as the media's generator,
+  // and connects its thread completion to its own deletion, therefore handling its own memory. Nothing else needs to
+  // be done.
+  new PreviewGenerator(m);
+}
diff --git a/io/previewgenerator.h b/io/previewgenerator.h
index 2db1cae14..590489ddc 100644
--- a/io/previewgenerator.h
+++ b/io/previewgenerator.h
@@ -42,6 +42,8 @@ public:
   PreviewGenerator(Media*);
   void run();
   void cancel();
+
+  static void AnalyzeMedia(Media*);
 private:
   void parse_media();
   bool retrieve_preview(const QString &hash);
diff --git a/panels/project.cpp b/panels/project.cpp
index 2c2c70d19..786f6e82d 100644
--- a/panels/project.cpp
+++ b/panels/project.cpp
@@ -832,7 +832,7 @@ void Project::process_file_list(QStringList& files, bool recursive, Media* repla
 
       for (int i=0;i<last_imported_media.size();i++) {
         // generate waveform/thumbnail in another thread
-        PreviewGenerator* pg = new PreviewGenerator(last_imported_media.at(i));
+        PreviewGenerator::AnalyzeMedia(last_imported_media.at(i));
       }
     } else {
       delete ca;
diff --git a/project/undo.cpp b/project/undo.cpp
index 0c26c3be2..efcd57569 100644
--- a/project/undo.cpp
+++ b/project/undo.cpp
@@ -528,7 +528,7 @@ void ReplaceMediaCommand::replace(QString& filename) {
   QStringList files;
   files.append(filename);
   panel_project->process_file_list(files, false, item, nullptr);
-  PreviewGenerator* pg = new PreviewGenerator(item);
+  PreviewGenerator::AnalyzeMedia(item);
 }
 
 void ReplaceMediaCommand::doUndo() {
diff --git a/ui/menuhelper.h b/ui/menuhelper.h
index 2f6ddea49..4d7c1cf8b 100644
--- a/ui/menuhelper.h
+++ b/ui/menuhelper.h
@@ -220,6 +220,6 @@ namespace olive {
      * @brief A global MenuHelper object to assist menu creation throughout Olive.
      */
 extern MenuHelper MenuHelper;
-}
+};
 
 #endif // MENUHELPER_H