diff --git a/picard/tagger.py b/picard/tagger.py
index a3133ab9..50fa3364 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -747,7 +747,7 @@ class Tagger(QtWidgets.QApplication):
     def lookup_cd(self, action):
         """Reads CD from the selected drive and tries to lookup the DiscID on MusicBrainz."""
         if isinstance(action, QtWidgets.QAction):
-            device = action.text()
+            device = action.data()
         elif config.setting["cd_lookup_device"] != '':
             device = config.setting["cd_lookup_device"].split(",", 1)[0]
         else:
diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py
index b1f08ff3..ec12e96a 100644
--- a/picard/ui/mainwindow.py
+++ b/picard/ui/mainwindow.py
@@ -471,6 +471,7 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry):
                 self.cd_lookup_action.setEnabled(True)
                 for drive in drives:
                     action = self.cd_lookup_menu.addAction(drive)
+                    action.setData(drive)
                     if drive == shortcut_drive:
                         # Clear existing shortcode on main action and assign it to sub-action
                         self.cd_lookup_action.setShortcut(QtGui.QKeySequence())