diff --git a/shell/sugar-activity b/shell/sugar-activity
index 8e4b149c..8a237aee 100755
--- a/shell/sugar-activity
+++ b/shell/sugar-activity
@@ -19,8 +19,6 @@
 import sys
 import os
 
-sys.path.insert(0, env.get_activities_dir())
-
 from sugar.activity import ActivityFactory
 
 ActivityFactory.create(sys.argv[1])
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory
index 7b543c27..66a9f07d 100755
--- a/shell/sugar-activity-factory
+++ b/shell/sugar-activity-factory
@@ -18,6 +18,7 @@
 
 import sys
 import logging
+import os
 
 import pygtk
 pygtk.require('2.0')
@@ -29,10 +30,14 @@ import dbus.glib
 gobject.threads_init()
 dbus.glib.threads_init()
 
-from sugar.activity import ActivityFactory
-import sugar.logger
+from sugar import logger
+from sugar import env
 
-sugar.logger.start(sys.argv[1])
+sys.path.insert(0, env.get_activities_dir())
+
+from sugar.activity import ActivityFactory
+
+logger.start(sys.argv[1])
 
 logging.info('Starting activity factory %s' % sys.argv[1])