diff --git a/src/jarabe/view/viewsource.py b/src/jarabe/view/viewsource.py
index 9bc67ef..d5f92fe 100644
--- a/src/jarabe/view/viewsource.py
+++ b/src/jarabe/view/viewsource.py
@@ -114,8 +114,6 @@ class ViewSource(gtk.Window):
         _logger.debug('ViewSource paths: %r %r %r', bundle_path,
                       document_path, sugar_toolkit_path)
 
-        self._sugar_toolkit_path = sugar_toolkit_path
-
         self.set_decorated(False)
         self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
         self.set_border_width(style.LINE_WIDTH)
@@ -125,6 +123,7 @@ class ViewSource(gtk.Window):
         self.set_size_request(width, height)
 
         self._parent_window_xid = window_xid
+        self._sugar_toolkit_path = sugar_toolkit_path
 
         self.connect('realize', self.__realize_cb)
         self.connect('destroy', self.__destroy_cb, document_path)
@@ -169,13 +168,13 @@ class ViewSource(gtk.Window):
         tree_panes.add1(self._bundle_source_viewer)
         self._bundle_source_viewer.show()
 
-        self._sugar_source_viewer = FileViewer(sugar_toolkit_path, None)
+        file_name = 'env.py'
+        self._selected_sugar_file = os.path.join(sugar_toolkit_path, file_name)
+        self._sugar_source_viewer = FileViewer(sugar_toolkit_path, file_name)
         self._sugar_source_viewer.connect('file-selected',
                                           self.__file_selected_cb)
         tree_panes.add2(self._sugar_source_viewer)
         self._sugar_source_viewer.hide()
-        self._selected_sugar_file = os.path.join(sugar_toolkit_path,
-                                                 'activity', 'activity.py')
 
         pane.add1(tree_panes)
 
@@ -218,8 +217,8 @@ class ViewSource(gtk.Window):
                           path)
             self._sugar_source_viewer.set_path(path)
             self._source_display.file_path = self._selected_sugar_file
-            self._bundle_source_viewer.hide()
             self._sugar_source_viewer.show()
+            self._bundle_source_viewer.hide()
         else:
             _logger.debug('_select_source called with path: %r', path)
             self._bundle_source_viewer.set_path(path)
@@ -464,7 +463,6 @@ class FileViewer(gtk.ScrolledWindow):
         self._add_dir_to_model(path)
 
     def _add_dir_to_model(self, dir_path, parent=None):
-
         for f in os.listdir(dir_path):
             if not f.endswith(_EXCLUDE_SUFFIX) and not f in _EXCLUDE_FILE:
                 full_path = os.path.join(dir_path, f)
