diff --git a/main/gui/source/init/run/cli.cpp b/main/gui/source/init/run/cli.cpp
index fefb473b0..6f9797795 100644
--- a/main/gui/source/init/run/cli.cpp
+++ b/main/gui/source/init/run/cli.cpp
@@ -65,9 +65,6 @@ namespace hex::init {
             PluginManager::load(dir);
         }
 
-        // Setup messaging system to allow sending commands to the main ImHex instance
-        hex::messaging::setupMessaging();
-
         // Process the arguments
         hex::subcommands::processArguments(args);
 
diff --git a/main/gui/source/main.cpp b/main/gui/source/main.cpp
index 61dbbc4a9..7b0dd7216 100644
--- a/main/gui/source/main.cpp
+++ b/main/gui/source/main.cpp
@@ -4,8 +4,8 @@
 
 #include <hex/helpers/logger.hpp>
 
-#include "window.hpp"
-#include "init/splash_window.hpp"
+#include <window.hpp>
+#include <messaging.hpp>
 
 #include "crash_handlers.hpp"
 
@@ -38,6 +38,9 @@ int main(int argc, char **argv) {
     // Run platform-specific initialization code
     Window::initNative();
 
+    // Setup messaging system to allow sending commands to the main ImHex instance
+    hex::messaging::setupMessaging();
+
     // Handle command line arguments if any have been passed
     if (argc > 1) {
         init::runCommandLine(argc, argv);