diff --git a/picard/ui/ui_cdlookup.py b/picard/ui/ui_cdlookup.py
index 12e855c24..3e2067e75 100644
--- a/picard/ui/ui_cdlookup.py
+++ b/picard/ui/ui_cdlookup.py
@@ -50,7 +50,7 @@ class Ui_Dialog(object):
         _translate = QtCore.QCoreApplication.translate
         Dialog.setWindowTitle(_("CD Lookup"))
         self.label.setText(_("The following releases on MusicBrainz match the CD:"))
-        self.ok_button.setText(_("OK"))
-        self.lookup_button.setText(_("Lookup manually"))
-        self.cancel_button.setText(_("Cancel"))
+        self.ok_button.setText(_("&Load into Picard"))
+        self.lookup_button.setText(_("Lookup in &Browser"))
+        self.cancel_button.setText(_("&Cancel"))
 
diff --git a/ui/cdlookup.ui b/ui/cdlookup.ui
index ebf8f1d9e..dd18be425 100644
--- a/ui/cdlookup.ui
+++ b/ui/cdlookup.ui
@@ -37,7 +37,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout">
+    <layout class="QHBoxLayout" name="hboxlayout">
      <property name="spacing">
       <number>6</number>
      </property>
@@ -45,7 +45,7 @@
       <number>0</number>
      </property>
      <item>
-      <spacer>
+      <spacer name="hspacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -63,21 +63,21 @@
         <bool>false</bool>
        </property>
        <property name="text">
-        <string>OK</string>
+        <string>&amp;Load into Picard</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="lookup_button">
        <property name="text">
-        <string>Lookup manually</string>
+        <string>Lookup in &amp;Browser</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="cancel_button">
        <property name="text">
-        <string>Cancel</string>
+        <string>&amp;Cancel</string>
        </property>
       </widget>
      </item>