diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp
index a51a19ec6..39d5d3d2a 100644
--- a/sources/qetapp.cpp
+++ b/sources/qetapp.cpp
@@ -76,6 +76,9 @@ QETApp::QETApp() :
 {
 	m_qetapp = this;
 	parseArguments();
+    if (non_interactive_execution_) {
+        std::exit(EXIT_SUCCESS);
+    }
 	initConfiguration();
 	initLanguage();
 	QET::Icons::initIcons();
@@ -105,9 +108,10 @@ QETApp::QETApp() :
 	}
 	
 	buildSystemTrayMenu();
-	if (m_splash_screen) {
-		m_splash_screen -> hide();
-	}
+    if (m_splash_screen) {
+        m_splash_screen -> hide();
+    }
+	
 	checkBackupFiles();
 }