diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index 0b6519ce..b57df481 100644
--- a/shell/view/Shell.py
+++ b/shell/view/Shell.py
@@ -24,7 +24,7 @@ from view.home.HomeWindow import HomeWindow
 from sugar.activity.activityhandle import ActivityHandle
 from sugar.graphics.popupcontext import PopupContext
 from view.ActivityHost import ActivityHost
-from sugar.activity import activityfactory
+from sugar.activity import activityfactory, bundleregistry
 from view.frame.frame import Frame
 from view.keyhandler import KeyHandler
 import sugar
@@ -113,7 +113,7 @@ class Shell(gobject.GObject):
         # Get the service name for this activity, if
         # we have a bundle on the system capable of handling
         # this activity type
-        breg = self._model.get_bundle_registry()
+        breg = bundleregistry.get_registry()
         bundle = breg.get_bundle(bundle_id)
         if not bundle:
             logging.error("Couldn't find activity for type %s" % bundle_id)
diff --git a/shell/view/home/FriendView.py b/shell/view/home/FriendView.py
index b8016242..5dc98a59 100644
--- a/shell/view/home/FriendView.py
+++ b/shell/view/home/FriendView.py
@@ -21,6 +21,7 @@ from view.BuddyIcon import BuddyIcon
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics import units
 from sugar.presence import presenceservice
+from sugar.activity import bundleregistry
 
 class FriendView(hippo.CanvasBox):
     def __init__(self, shell, menu_shell, buddy, **kwargs):
@@ -45,7 +46,7 @@ class FriendView(hippo.CanvasBox):
         self._buddy.connect('color-changed', self._buddy_color_changed_cb)
 
     def _get_new_icon_name(self, activity):
-        registry = shell.get_model().get_bundle_registry()
+        registry = bundleregistry.get_registry()
         bundle = registry.get_bundle(activity.get_type())
         if bundle:
             return bundle.get_icon()