diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp
index ebc67a9d3..672d61c49 100644
--- a/src/core/songloader.cpp
+++ b/src/core/songloader.cpp
@@ -106,28 +106,34 @@ SongLoader::Result SongLoader::LoadAudioCD() {
   GstElement *cdda = gst_element_make_from_uri (GST_URI_SRC, "cdda://", NULL);
   if (cdda == NULL) {
     qLog(Error) << "Error while creating CDDA GstElement";
+    return Error;
   }
 
   // Change the element's state to ready and paused, to be able to query it
   if (gst_element_set_state(cdda, GST_STATE_READY) == GST_STATE_CHANGE_FAILURE
-    || gst_element_set_state(cdda, GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE) {
+      || gst_element_set_state(cdda, GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE) {
     qLog(Error) << "Error while changing CDDA GstElement's state";
+    gst_object_unref(GST_OBJECT(cdda));
+    return Error;
   }
 
   // Get number of tracks
   GstFormat fmt = gst_format_get_by_nick ("track");
   GstFormat out_fmt = fmt;
-  gint64 num_tracks;
+  gint64 num_tracks = 0;
   if (!gst_element_query_duration (cdda, &out_fmt, &num_tracks) || out_fmt != fmt) {
     qLog(Error) << "Error while querying cdda GstElement";
+    gst_object_unref(GST_OBJECT(cdda));
+    return Error;
   }
 
-  for (int track_number=1; track_number<=num_tracks; track_number++) {
+  for (int track_number = 1; track_number <= num_tracks; track_number++) {
     // Init song
     Song song;
-    guint64 duration;
+    guint64 duration = 0;
     // quint64 == ulonglong and guint64 == ulong, therefore we must cast
-    if (gst_tag_list_get_uint64 (GST_CDDA_BASE_SRC(cdda)->tracks[track_number-1].tags, GST_TAG_DURATION, &duration)) {
+    if (gst_tag_list_get_uint64 (GST_CDDA_BASE_SRC(cdda)->tracks[track_number-1].tags,
+                                 GST_TAG_DURATION, &duration)) {
       song.set_length_nanosec((quint64)duration);
     }
     song.set_valid(true);
@@ -151,21 +157,29 @@ SongLoader::Result SongLoader::LoadAudioCD() {
   gst_message_parse_tag (msg, &tags);
   char *string_mb = NULL;
   if (gst_tag_list_get_string (tags, GST_TAG_CDDA_MUSICBRAINZ_DISCID, &string_mb)) {
-  }
-  QString musicbrainz_discid(string_mb);
-  qLog(Info) << "MusicBrainz discid: " << musicbrainz_discid;
+    QString musicbrainz_discid(string_mb);
+    qLog(Info) << "MusicBrainz discid: " << musicbrainz_discid;
 
-  MusicBrainzClient *musicbrainz_client = new MusicBrainzClient(this);
-  connect(musicbrainz_client,
-          SIGNAL(Finished(const QString&, const QString&, MusicBrainzClient::ResultList)),
-          SLOT(AudioCDTagsLoaded(const QString&, const QString&, MusicBrainzClient::ResultList)));
-  musicbrainz_client->StartDiscIdRequest(musicbrainz_discid);
+    MusicBrainzClient *musicbrainz_client = new MusicBrainzClient(this);
+    connect(musicbrainz_client,
+            SIGNAL(Finished(const QString&, const QString&, MusicBrainzClient::ResultList)),
+            SLOT(AudioCDTagsLoaded(const QString&, const QString&, MusicBrainzClient::ResultList)));
+    musicbrainz_client->StartDiscIdRequest(musicbrainz_discid);
+    g_free(string_mb);
+  }
+  
+  // Clean all the Gstreamer objects we have used: we don't need them anymore
+  gst_object_unref(GST_OBJECT(cdda));
+  gst_element_set_state (pipe, GST_STATE_NULL);
+  gst_object_unref(GST_OBJECT(pipe));
+  gst_object_unref(GST_OBJECT(msg));
+  gst_object_unref(GST_OBJECT(tags));
 
  return Success;
 }
 
 void SongLoader::AudioCDTagsLoaded(const QString& artist, const QString& album,
-                                   MusicBrainzClient::ResultList results) {
+                                   const MusicBrainzClient::ResultList& results) {
   // Remove previously added songs metadata, because there are not needed
   // and that we are going to fill it with new (more complete) ones
   songs_.clear();
@@ -177,7 +191,7 @@ void SongLoader::AudioCDTagsLoaded(const QString& artist, const QString& album,
     song.set_title(ret.title_);
     song.set_length_nanosec(ret.duration_msec_ * kNsecPerMsec);
     song.set_track(track_number);
-    // We need to set url: that's how playlist whill know what item to update
+    // We need to set url: that's how playlist will find the correct item to update
     song.set_url(QUrl(QString("cdda://%1").arg(track_number++)));
     songs_ << song;
   }
diff --git a/src/core/songloader.h b/src/core/songloader.h
index 6bf039a95..dd172bd46 100644
--- a/src/core/songloader.h
+++ b/src/core/songloader.h
@@ -72,7 +72,7 @@ private slots:
   void Timeout();
   void StopTypefind();
   void AudioCDTagsLoaded(const QString& artist, const QString& album,
-                         MusicBrainzClient::ResultList);
+                         const MusicBrainzClient::ResultList& results);
 
 private:
   enum State {
diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp
index 8e5a3b1e4..2d1401d2e 100644
--- a/src/musicbrainz/musicbrainzclient.cpp
+++ b/src/musicbrainz/musicbrainzclient.cpp
@@ -86,7 +86,7 @@ void MusicBrainzClient::DiscIdRequestFinished() {
   QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
   if (!reply)
     return;
-    reply->deleteLater();
+  reply->deleteLater();
 
   ResultList ret;
   QString artist;
diff --git a/src/playlist/songloaderinserter.cpp b/src/playlist/songloaderinserter.cpp
index f8dd789aa..fcf1e83fd 100644
--- a/src/playlist/songloaderinserter.cpp
+++ b/src/playlist/songloaderinserter.cpp
@@ -114,6 +114,7 @@ void SongLoaderInserter::AudioCDTagsLoaded(bool success) {
     destination_->UpdateItems(loader->songs());
   else
     qLog(Error) << "Error while getting audio CD metadata from MusicBrainz";
+  deleteLater();
 }
 
 void SongLoaderInserter::PendingLoadFinished(bool success) {
diff --git a/src/translations/ar.po b/src/translations/ar.po
index db46228e9..d2ba264ec 100644
--- a/src/translations/ar.po
+++ b/src/translations/ar.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/be.po b/src/translations/be.po
index 16958e2b5..738e59fa8 100644
--- a/src/translations/be.po
+++ b/src/translations/be.po
@@ -1930,7 +1930,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/bg.po b/src/translations/bg.po
index b7552a438..2e17b1b31 100644
--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@@ -1955,7 +1955,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Покажи само първите"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/br.po b/src/translations/br.po
index a1f18bf6f..503bc0283 100644
--- a/src/translations/br.po
+++ b/src/translations/br.po
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/bs.po b/src/translations/bs.po
index e48b328be..99a2bc67a 100644
--- a/src/translations/bs.po
+++ b/src/translations/bs.po
@@ -1933,7 +1933,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/ca.po b/src/translations/ca.po
index e384878ca..734da481e 100644
--- a/src/translations/ca.po
+++ b/src/translations/ca.po
@@ -1953,7 +1953,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/cs.po b/src/translations/cs.po
index ad8557d48..9c4902aff 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -1952,7 +1952,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Ukázat pouze první"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/cy.po b/src/translations/cy.po
index 8a8e85a11..88ca91559 100644
--- a/src/translations/cy.po
+++ b/src/translations/cy.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/da.po b/src/translations/da.po
index 8fd493e06..4ba9e5d52 100644
--- a/src/translations/da.po
+++ b/src/translations/da.po
@@ -1919,7 +1919,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/de.po b/src/translations/de.po
index 22559242f..3d6a74a44 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -1957,7 +1957,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Nur die ersten"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/el.po b/src/translations/el.po
index b26f5c8a6..f33079495 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -1968,7 +1968,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Εμφάνιση μόνο του πρώτου"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/en.po b/src/translations/en.po
index ab4f02dac..6413ba1d5 100644
--- a/src/translations/en.po
+++ b/src/translations/en.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po
index 158b8ab14..44b7477d5 100644
--- a/src/translations/en_CA.po
+++ b/src/translations/en_CA.po
@@ -1920,7 +1920,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po
index 6428fc061..8342d309f 100644
--- a/src/translations/en_GB.po
+++ b/src/translations/en_GB.po
@@ -1917,7 +1917,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/eo.po b/src/translations/eo.po
index 69bbbe05b..8db5ff414 100644
--- a/src/translations/eo.po
+++ b/src/translations/eo.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/es.po b/src/translations/es.po
index 92e641006..8ba3a6376 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -1969,7 +1969,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Solo mostrar el primero"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/et.po b/src/translations/et.po
index d1b39f9f1..4f47a3d01 100644
--- a/src/translations/et.po
+++ b/src/translations/et.po
@@ -1917,7 +1917,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/eu.po b/src/translations/eu.po
index e5b7534ef..1948b6671 100644
--- a/src/translations/eu.po
+++ b/src/translations/eu.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/fi.po b/src/translations/fi.po
index efa85a097..9dedf3355 100644
--- a/src/translations/fi.po
+++ b/src/translations/fi.po
@@ -1939,7 +1939,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/fr.po b/src/translations/fr.po
index 4c18f3d84..7478a083f 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -1973,7 +1973,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Afficher seulement le premier"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/gl.po b/src/translations/gl.po
index ab05f80af..acf9a4795 100644
--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@@ -1925,7 +1925,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/he.po b/src/translations/he.po
index 67f4ed2fe..55a14dfc1 100644
--- a/src/translations/he.po
+++ b/src/translations/he.po
@@ -1934,7 +1934,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "הצג רק את הראשון"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/hi.po b/src/translations/hi.po
index 34c899a31..936beddfe 100644
--- a/src/translations/hi.po
+++ b/src/translations/hi.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/hr.po b/src/translations/hr.po
index 6a9410226..284210010 100644
--- a/src/translations/hr.po
+++ b/src/translations/hr.po
@@ -1952,7 +1952,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Samo prikaži prvi"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/hu.po b/src/translations/hu.po
index 911de7c7e..bb0ac2bc9 100644
--- a/src/translations/hu.po
+++ b/src/translations/hu.po
@@ -1954,7 +1954,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Csak a legelsőt mutassa"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/hy.po b/src/translations/hy.po
index 81f27fe55..0c05eb4eb 100644
--- a/src/translations/hy.po
+++ b/src/translations/hy.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/is.po b/src/translations/is.po
index ccc7e2a52..e70a040cf 100644
--- a/src/translations/is.po
+++ b/src/translations/is.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/it.po b/src/translations/it.po
index f6bfca875..a189870a2 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -1963,7 +1963,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Mostra solo la prima"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/ja.po b/src/translations/ja.po
index c38e2e1ab..5ca9a05a5 100644
--- a/src/translations/ja.po
+++ b/src/translations/ja.po
@@ -1942,7 +1942,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "先頭の未表示する"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/kk.po b/src/translations/kk.po
index cc2072ecc..2d8d0844b 100644
--- a/src/translations/kk.po
+++ b/src/translations/kk.po
@@ -1916,7 +1916,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/lt.po b/src/translations/lt.po
index acf784337..f299ee46d 100644
--- a/src/translations/lt.po
+++ b/src/translations/lt.po
@@ -1951,7 +1951,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Rodyti tik pirmą"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/lv.po b/src/translations/lv.po
index b91ab218a..adf6bbff9 100644
--- a/src/translations/lv.po
+++ b/src/translations/lv.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/ms.po b/src/translations/ms.po
index 1541ee853..d8ef92bf4 100644
--- a/src/translations/ms.po
+++ b/src/translations/ms.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/nb.po b/src/translations/nb.po
index f854655d6..c3879072b 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -1928,7 +1928,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/nl.po b/src/translations/nl.po
index 326915b87..28271a201 100644
--- a/src/translations/nl.po
+++ b/src/translations/nl.po
@@ -1962,7 +1962,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Alleen de eerste tonen."
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/oc.po b/src/translations/oc.po
index 5cf18d1cb..d5f555bf8 100644
--- a/src/translations/oc.po
+++ b/src/translations/oc.po
@@ -1916,7 +1916,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/pa.po b/src/translations/pa.po
index 9fcc38e24..efb007938 100644
--- a/src/translations/pa.po
+++ b/src/translations/pa.po
@@ -1916,7 +1916,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/pl.po b/src/translations/pl.po
index a0c293b8b..09f224ceb 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -1955,7 +1955,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Pokaż tylko pierwsze"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/pt.po b/src/translations/pt.po
index 9edbf06eb..69bffc138 100644
--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@@ -1958,7 +1958,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Mostrar apenas a primeira"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po
index f0cf726fd..c36d9d62a 100644
--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@@ -1957,7 +1957,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Só mostrar o primeiro"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/ro.po b/src/translations/ro.po
index bddd441c5..355190c12 100644
--- a/src/translations/ro.po
+++ b/src/translations/ro.po
@@ -1952,7 +1952,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/ru.po b/src/translations/ru.po
index 63d129630..505fb2484 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -1951,7 +1951,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Показывать только первый"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/sk.po b/src/translations/sk.po
index a658a264a..e96f9221c 100644
--- a/src/translations/sk.po
+++ b/src/translations/sk.po
@@ -1947,7 +1947,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Iba prvé zobraziť"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/sl.po b/src/translations/sl.po
index 706639aa3..5ec96fa13 100644
--- a/src/translations/sl.po
+++ b/src/translations/sl.po
@@ -1950,7 +1950,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Pokaži le prve"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/sr.po b/src/translations/sr.po
index 39a6da20f..7a29f322b 100644
--- a/src/translations/sr.po
+++ b/src/translations/sr.po
@@ -1924,7 +1924,7 @@ msgstr "ОГГ Ворбис"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/sv.po b/src/translations/sv.po
index a07d055c2..df330df33 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -1950,7 +1950,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Visa endast de första"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/tr.po b/src/translations/tr.po
index f41c30bec..f20107d21 100644
--- a/src/translations/tr.po
+++ b/src/translations/tr.po
@@ -1949,7 +1949,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Sadece ilki göster"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/translations.pot b/src/translations/translations.pot
index 1284b22d2..268731d60 100644
--- a/src/translations/translations.pot
+++ b/src/translations/translations.pot
@@ -1906,7 +1906,7 @@ msgstr ""
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/uk.po b/src/translations/uk.po
index 766ce3965..27a3f81d6 100644
--- a/src/translations/uk.po
+++ b/src/translations/uk.po
@@ -1948,7 +1948,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Показувати лише перший"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/vi.po b/src/translations/vi.po
index 9a1bb74e3..cce9b96f9 100644
--- a/src/translations/vi.po
+++ b/src/translations/vi.po
@@ -1951,7 +1951,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr "Hiện số bài hát đầu tiên"
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po
index 297d94bfb..38982e2f0 100644
--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@@ -1918,7 +1918,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po
index 69a314b7e..678b26063 100644
--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@@ -1920,7 +1920,7 @@ msgstr "Ogg Vorbis"
 msgid "Only show the first"
 msgstr ""
 
-msgid "Open CD..."
+msgid "Open &audio CD..."
 msgstr ""
 
 msgid "Open device"
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index 37a21e1ce..2894805c2 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -661,7 +661,7 @@
   </action>
   <action name="action_open_cd">
     <property name="text">
-      <string>Open CD...</string>
+      <string>Open &amp;audio CD...</string>
     </property>
   </action>
   <action name="action_cover_manager">