diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 37f1d9e513..19d0c5f068 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -161,7 +161,7 @@ class DeviceManager(Thread):
                         print 'Device connect failed again, giving up'
 
     def umount_device(self, *args):
-        if self.is_device_connected:
+        if self.is_device_connected and not self.job_manager.has_device_jobs():
             self.connected_device.eject()
             self.ejected_devices.add(self.connected_device)
             self.connected_slot(False, self.connected_device_is_folder)