diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 22b8f2c8dc..4db31c3dea 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -706,7 +706,7 @@ class DeviceMixin(object): # {{{
 
     # Device connected {{{
 
-    def set_device_menu_items_state(self, connected, device_kind):
+    def set_device_menu_items_state(self, connected):
         if connected:
             self._sync_menu.connect_to_folder_action.setEnabled(False)
             self._sync_menu.connect_to_itunes_action.setEnabled(False)
@@ -726,7 +726,7 @@ class DeviceMixin(object): # {{{
         '''
         Called when a device is connected to the computer.
         '''
-        self.set_device_menu_items_state(connected, device_kind)
+        self.set_device_menu_items_state(connected)
         if connected:
             self.device_manager.get_device_information(\
                     Dispatcher(self.info_read))
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 590329ec13..c2ff99932d 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -410,9 +410,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceMixin, ToolbarMixin, # {{{
             self.tags_view.set_new_model() # in case columns changed
             self.tags_view.recount()
             self.create_device_menu()
-            self.set_device_menu_items_state(bool(self.device_connected),
-                    self.device_connected == 'folder')
-
+            self.set_device_menu_items_state(bool(self.device_connected))
             if not patheq(self.library_path, d.database_location):
                 newloc = d.database_location
                 move_library(self.library_path, newloc, self,