diff --git a/src/application.py b/src/application.py
index 1d46b2e1b..901412887 100644
--- a/src/application.py
+++ b/src/application.py
@@ -229,6 +229,10 @@ class GajimApplication(Gtk.Application):
             self.profile_separation = True
         if options.contains('config-path'):
             self.config_path = options.lookup_value('config-path').get_string()
+        if options.contains('version'):
+            from common.defs import version
+            print(version)
+            return 0
         return -1
 
     def do_command_line(self, command_line: Gio.ApplicationCommandLine) -> int:
diff --git a/src/gajim.py b/src/gajim.py
index 4f2002a25..f1c0aa324 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -37,11 +37,6 @@
 
 import sys
 
-if '--version' in sys.argv or '-V' in sys.argv:
-    from common.defs import version
-    print(version)
-    sys.exit(0)
-
 # Test here for all required versions so we dont have to
 # test multiple times in every module. nbxmpp also needs GLib.
 import gi