diff --git a/app/crashhandler/CMakeLists.txt b/app/crashhandler/CMakeLists.txt
index db5c97b56..c734db605 100644
--- a/app/crashhandler/CMakeLists.txt
+++ b/app/crashhandler/CMakeLists.txt
@@ -17,9 +17,8 @@
 # Create crash handler executable
 add_executable(
   olive-crashhandler
-  crashhandler/crashhandler.h
-  crashhandler/crashhandler.cpp
-  crashhandler/crashhandlermain.cpp
+  crashhandler.cpp
+  crashhandler.h
 )
 
 # Disable console appearing on crash handler dialog
diff --git a/app/crashhandler/crashhandler.cpp b/app/crashhandler/crashhandler.cpp
index aea4af023..f23cae312 100644
--- a/app/crashhandler/crashhandler.cpp
+++ b/app/crashhandler/crashhandler.cpp
@@ -328,3 +328,33 @@ void CrashHandlerDialog::closeEvent(QCloseEvent* e)
 }
 
 }
+
+int main(int argc, char *argv[])
+{
+  QString report;
+
+#ifdef Q_OS_WINDOWS
+  int num_args;
+  LPWSTR *args = CommandLineToArgvW(GetCommandLineW(), &num_args);
+  if (num_args < 2) {
+    LocalFree(args);
+    return 1;
+  }
+
+  report = QString::fromWCharArray(args[1]);
+  LocalFree(args);
+#else
+  if (argc < 2) {
+    return 1;
+  }
+
+  report = argv[1];
+#endif
+
+  QApplication a(argc, argv);
+
+  olive::CrashHandlerDialog chd(report);
+  chd.open();
+
+  return a.exec();
+}
diff --git a/app/crashhandler/crashhandlermain.cpp b/app/crashhandler/crashhandlermain.cpp
deleted file mode 100644
index f9a062781..000000000
--- a/app/crashhandler/crashhandlermain.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/***
-
-  Olive - Non-Linear Video Editor
-  Copyright (C) 2021 Olive Team
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-***/
-
-#include "crashhandler.h"
-
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-  QString report;
-
-#ifdef Q_OS_WINDOWS
-  int num_args;
-  LPWSTR *args = CommandLineToArgvW(GetCommandLineW(), &num_args);
-  if (num_args < 2) {
-    LocalFree(args);
-    return 1;
-  }
-
-  report = QString::fromWCharArray(args[1]);
-  LocalFree(args);
-#else
-  if (argc < 2) {
-    return 1;
-  }
-
-  report = argv[1];
-#endif
-
-  QApplication a(argc, argv);
-
-  olive::CrashHandlerDialog chd(report);
-  chd.open();
-
-  return a.exec();
-}