Bunch of fixes

shell/view/frame/ActivitiesBox.py

@@ -76,7 +76,6 @@ class ActivitiesBox(hippo.CanvasBox):
         self._invites.connect('invite-removed', self._invite_removed_cb)
 
     def _activity_clicked_cb(self, icon):
-        self._shell.get_frame().hide()
         self._shell.start_activity(icon.get_bundle_id())
 
     def _invite_clicked_cb(self, icon):

shell/view/frame/frame.py

@@ -155,11 +155,16 @@ class Frame(object):
         self._key_listener = _KeyListener(self)
         self._mouse_listener = _MouseListener(self)
 
+        self.save_state()
+
     def save_state(self):
         self._saved_state = _FrameState(self.visible, self.mode)
 
     def restore_state(self):
-        if self.saved_state.visible:
+        if self._saved_state == None:
+            return
+
+        if self._saved_state.visible:
             self.show()
         else:
             self.hide()