diff --git a/shell/shellservice.py b/shell/shellservice.py
index 55a74bd9..d44144c3 100644
--- a/shell/shellservice.py
+++ b/shell/shellservice.py
@@ -42,8 +42,9 @@ class ShellService(dbus.service.Object):
     XXX At the moment the d-bus service methods do not appear to do
     anything other than add_bundle
     """
-    def __init__(self, shell_model):
-        self._shell_model = shell_model
+    def __init__(self, shell):
+        self._shell = shell
+        self._shell_model = shell.get_model()
 
         self._owner = self._shell_model.get_owner()
         self._owner.connect('nick-changed', self._owner_nick_changed_cb)
diff --git a/shell/sugar-shell b/shell/sugar-shell
index d84827bf..08b7b85b 100755
--- a/shell/sugar-shell
+++ b/shell/sugar-shell
@@ -115,8 +115,8 @@ if os.environ.has_key("TP_DEBUG"):
             break
 
 model = ShellModel()
-service = ShellService(model)
 shell = Shell(model)
+service = ShellService(shell)
 
 try:
 	gtk.main()