diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py
index 72b883a2a..4fa106c18 100644
--- a/picard/ui/mainwindow.py
+++ b/picard/ui/mainwindow.py
@@ -372,6 +372,9 @@ class MainWindow(QtGui.QMainWindow):
             self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextUnderIcon)
         else:
             self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+        
+        self.cd_lookup_action.setEnabled(len(get_cdrom_drives()) > 0)
+
 
     def create_toolbar(self):
         self.toolbar = toolbar = self.addToolBar(_(u"&Toolbar"))
diff --git a/picard/util/cdrom.py b/picard/util/cdrom.py
index f9502d098..68b17fabf 100644
--- a/picard/util/cdrom.py
+++ b/picard/util/cdrom.py
@@ -38,4 +38,6 @@ else:
     def get_cdrom_drives():
         from picard.tagger import Tagger
         tagger = Tagger.instance()
-        return [d.strip() for d in tagger.config.setting["cd_lookup_device"].split(",")]
+        # Need to filter out empty strings, particularly if the device list is empty
+        return filter(lambda string: (string != u''),
+                      [d.strip() for d in tagger.config.setting["cd_lookup_device"].split(",")])