diff --git a/src/calibre/gui2/actions/preferences.py b/src/calibre/gui2/actions/preferences.py
index c298dfa594..bec5e45f23 100644
--- a/src/calibre/gui2/actions/preferences.py
+++ b/src/calibre/gui2/actions/preferences.py
@@ -74,8 +74,7 @@ class PreferencesAction(InterfaceAction):
         if d.do_restart:
             self.gui.quit(restart=True)
 
-    def do_config(self, checked=False, initial_plugin=None,
-            close_after_initial=False):
+    def do_config(self, checked=False, initial_plugin=None, close_after_initial=False):
         if self.gui.job_manager.has_jobs():
             d = error_dialog(self.gui, _('Cannot configure'),
                     _('Cannot configure while there are running jobs.'))
diff --git a/src/calibre/gui2/central.py b/src/calibre/gui2/central.py
index 691181ee90..ee0486f591 100644
--- a/src/calibre/gui2/central.py
+++ b/src/calibre/gui2/central.py
@@ -185,7 +185,7 @@ class LayoutButton(QToolButton):
             tab_name = {
                 'book_details':'book_details',
                 'cover_grid':'cover_grid',
-                'bookshelf_view':'bookshelf_view',
+                'bookshelf_view':'bookshelf',
                 'cover_browser':'cover_browser',
                 'tag_browser':'tag_browser',
                 'quick_view':'quickview',