diff --git a/extensions/cpsection/background/view.py b/extensions/cpsection/background/view.py
index c252834..ed6da55 100644
--- a/extensions/cpsection/background/view.py
+++ b/extensions/cpsection/background/view.py
@@ -15,6 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+import sys
 import os
 
 from gi.repository import Gtk
@@ -100,8 +101,12 @@ class Background(SectionView):
         self.pack_start(alpha_alignment, False, False, 0)
         alpha_alignment.show()
 
-        self._paths_list = []
+        self._scan()
+
+        self.setup()
 
+    def _scan(self):
+        self._paths_list = []
         file_paths = []
         for directory in self._model.BACKGROUNDS_DIRS:
             if directory is not None and os.path.exists(directory):
@@ -110,7 +115,6 @@ class Background(SectionView):
                         file_paths.append(os.path.join(root, file_))
 
         self._append_to_store(file_paths)
-        self.setup()
 
     def _append_to_store(self, file_paths):
         if file_paths:
@@ -176,9 +180,16 @@ class Background(SectionView):
 
     def _clear_clicked_cb(self, widget, event=None):
         self._model.set_background_image_path(None)
+        self._store.clear()
+        self._scan()
 
     def setup(self):
         self.show_all()
 
     def undo(self):
+        print >>sys.stderr, "undo"
         self._model.undo()
+
+    def __del__(self):
+        print >>sys.stderr, "clear"
+        self._store.clear()
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index aad48e7..0a76768 100644
--- a/src/jarabe/view/buddymenu.py
+++ b/src/jarabe/view/buddymenu.py
@@ -165,8 +165,8 @@ class BuddyMenu(Palette):
         frame.hide()
 
         # show the control panel
-        panel = ControlPanel()
-        panel.show()
+        self._cp = ControlPanel()
+        self._cp.show()
 
     def _update_invite_menu(self, activity):
         buddy_activity = self._buddy.props.current_activity
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py
index 021368e..75d11d1 100644
--- a/src/jarabe/view/keyhandler.py
+++ b/src/jarabe/view/keyhandler.py
@@ -78,6 +78,7 @@ class KeyHandler(object):
         self._key_pressed = None
         self._keycode_pressed = 0
         self._keystate_pressed = 0
+        self._cp = None
 
         self._key_grabber = SugarExt.KeyGrabber()
         self._key_grabber.connect('key-pressed',
@@ -172,8 +173,8 @@ class KeyHandler(object):
     def handle_open_controlpanel(self, event_time):
         if shell.get_model().has_modal():
             return
-        panel = ControlPanel()
-        panel.show()
+        self._cp = ControlPanel()
+        self._cp.show()
 
     def handle_dump_ui_tree(self, event_time):
         print uitree.get_root().dump()