diff --git a/bin/mirage b/bin/mirage
index cacbae8..f16cb24 100755
--- a/bin/mirage
+++ b/bin/mirage
@@ -31,7 +31,7 @@
 import gettext
 import locale
 
-from gi.repository import Gio, Gdk
+from gi.repository import Gio
 
 
 LOCALE_DOMAIN = "mirage"
@@ -124,15 +124,10 @@
             file=sys.stderr,
         )
 
-    app = mirage.Base()
-    Gdk.threads_enter()
-
     try:
-        app.run([])
+        mirage.run([])
     except KeyboardInterrupt:
         pass
-
-    Gdk.threads_leave()
 
 
 if __name__ == "__main__":
diff --git a/mirage/__init__.py b/mirage/__init__.py
index 3be953c..99395a5 100755
--- a/mirage/__init__.py
+++ b/mirage/__init__.py
@@ -76,8 +76,6 @@
         )
 
     def do_activate(self):
-        Gdk.threads_init()
-
         # Constants
         self.open_mode_smart = 0
         self.open_mode_fit = 1
@@ -6423,3 +6421,10 @@
                 timer_screensaver = GLib.timeout_add(
                     1000, self.disable_screensaver_in_slideshow_mode
                 )
+
+def run(argv):
+    Gdk.threads_enter()
+    app = Base()
+    Gdk.threads_init()
+    app.run(argv)
+    Gdk.threads_leave()