diff --git a/data/gui/plugins_window.ui b/data/gui/plugins_window.ui
index 2895e2502b515642071bc5be98d403da6a946b5a..ffc55969dc59fc262e2afc140f716514684bb323 100644
--- a/data/gui/plugins_window.ui
+++ b/data/gui/plugins_window.ui
@@ -20,6 +20,7 @@
           <object class="GtkNotebook" id="plugins_notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <signal name="switch_page" handler="on_plugins_notebook_switch_page"/>
             <child>
               <object class="GtkHPaned" id="hpaned1">
                 <property name="visible">True</property>
diff --git a/src/plugins/gui.py b/src/plugins/gui.py
index ab0c0cc1d5dbeaee6001eb7a1daaf11769d283f2..5c48eae716f9d18868e18a017f13944b55b3e2ba 100644
--- a/src/plugins/gui.py
+++ b/src/plugins/gui.py
@@ -82,14 +82,19 @@ class PluginsWindow(object):
         self._clear_installed_plugin_info()
 
         self.fill_installed_plugins_model()
+        selection.select_iter(self.installed_plugins_model.get_iter_root())
 
         self.xml.connect_signals(self)
 
         self.plugins_notebook.set_current_page(0)
+        self.xml.get_object('close_button').grab_focus()
 
         self.window.show_all()
         gtkgui_helpers.possibly_move_window_in_current_desktop(self.window)
 
+    def on_plugins_notebook_switch_page(self, widget, page, page_num):
+        gobject.idle_add(self.xml.get_object('close_button').grab_focus)
+
     @log_calls('PluginsWindow')
     def installed_plugins_treeview_selection_changed(self, treeview_selection):
         model, iter = treeview_selection.get_selected()