diff --git a/ChangeLog b/ChangeLog
index 82f1bde9a..4c69f2b42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2006-05-20  Alex Roitman  <shura@gramps-project.org>
+	* src/gramps_main.py (Gramps.__init__): Call ArgHandler between
+	init_interface and post_init_interface.
+	* src/ViewManager.py (init_interface): Split off post_init_interface.
 	* src/GrampsDb/_ReadGedcom.py: Correct set_type calls.
 
 2006-05-19  Don Allingham  <don@gramps-project.org>
diff --git a/src/ViewManager.py b/src/ViewManager.py
index 736003cc7..49b0ed531 100644
--- a/src/ViewManager.py
+++ b/src/ViewManager.py
@@ -417,6 +417,7 @@ class ViewManager:
         self.fileactions.set_sensitive(True)
         self.uistate.widget.set_sensitive(True)
 
+    def post_init_interface(self):
         # Showing the main window is deferred so that
         # ArgHandler can work without it always shown
         self.window.show()
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 3294f8baf..52bf5b6db 100644
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -177,9 +177,10 @@ class Gramps:
         for view in DataViews.get_views():
             self.vm.register_view(view)
 
-        ArgHandler.ArgHandler(state,self.vm,args)
-
         self.vm.init_interface()
+        ArgHandler.ArgHandler(state,self.vm,args)
+        self.vm.post_init_interface()
+
         state.db.request_rebuild()
         state.change_active_person(state.db.get_default_person())