diff --git a/Common/Main.cpp b/Common/Main.cpp
index 53906bddc2e0466d019dea25bff0fa4e6136f55f..70f6b9bd68ae5f47f182f24cfc458b5a103782c1 100644
--- a/Common/Main.cpp
+++ b/Common/Main.cpp
@@ -21,8 +21,8 @@ int main(int argc, char *argv[])
   new GModel();
   GmshInitialize(argc, argv);
 
-  if(!Msg::GetClient())
-    CTX::instance()->terminal = CTX::instance()->noPopup = 1;
+  if(!Msg::GetClient()) CTX::instance()->terminal = 1;
+  CTX::instance()->noPopup = 1;
 
   GmshBatch();
   GmshFinalize();