diff --git a/source/main.cpp b/source/main.cpp
index f2a50c34c..b37c6f403 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -49,10 +49,8 @@ int main(int argc, char **argv) {
         hex::View::postEvent(hex::Events::FileDropped, argv[1]);
 
     window.initPlugins();
-
     window.loop();
 
-    window.deinitPlugins();
 
     return EXIT_SUCCESS;
 }
diff --git a/source/window.cpp b/source/window.cpp
index af4937369..25d3a277a 100644
--- a/source/window.cpp
+++ b/source/window.cpp
@@ -65,6 +65,8 @@ namespace hex {
         for (auto &view : ContentRegistry::Views::getEntries())
             delete view;
         ContentRegistry::Views::getEntries().clear();
+
+        this->deinitPlugins();
     }
 
     void Window::loop() {