diff --git a/src/main.cpp b/src/main.cpp
index e920c8dd3b..965aa1cb7c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -962,15 +962,12 @@ int main ( int argc, char** argv )
 
                 // show dialog
                 ClientDlg.show();
-                pApp->exec();
             }
             else
 #    endif
             {
                 // only start application without using the GUI
                 qInfo() << qUtf8Printable ( GetVersionAndNameStr ( false ) );
-
-                pApp->exec();
             }
         }
         else
@@ -1027,8 +1024,6 @@ int main ( int argc, char** argv )
                 {
                     ServerDlg.show();
                 }
-
-                pApp->exec();
             }
             else
 #endif
@@ -1042,10 +1037,10 @@ int main ( int argc, char** argv )
                 {
                     Server.SetDirectoryType ( AT_CUSTOM );
                 }
-
-                pApp->exec();
             }
         }
+
+        pApp->exec();
     }
 
     catch ( const CGenErr& generr )