diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index 9ed934010..7fd9c4b8b 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -589,19 +589,17 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
 #endif
 
   // Playlist menu
+  connect(playlist_menu_, SIGNAL(aboutToHide()), SLOT(PlaylistMenuHidden()));
   playlist_play_pause_ = playlist_menu_->addAction(tr("Play"), this, SLOT(PlaylistPlay()));
   playlist_menu_->addAction(ui_->action_stop);
   playlist_stop_after_ = playlist_menu_->addAction(IconLoader::Load("media-stop"), tr("Stop after this track"), this, SLOT(PlaylistStopAfter()));
   playlist_queue_ = playlist_menu_->addAction(IconLoader::Load("go-next"), tr("Toggle queue status"), this, SLOT(PlaylistQueue()));
-  playlist_queue_->setVisible(false);
   playlist_queue_->setShortcut(QKeySequence("Ctrl+D"));
   ui_->playlist->addAction(playlist_queue_);
   playlist_queue_play_next_ = playlist_menu_->addAction(IconLoader::Load("go-next"), tr("Queue selected tracks to play next"), this, SLOT(PlaylistQueuePlayNext()));
   playlist_queue_play_next_->setShortcut(QKeySequence("Ctrl+Shift+D"));
-  playlist_queue_play_next_->setVisible(false);
   ui_->playlist->addAction(playlist_queue_play_next_);
   playlist_skip_ = playlist_menu_->addAction(IconLoader::Load("media-forward"), tr("Toggle skip status"), this, SLOT(PlaylistSkip()));
-  playlist_skip_->setVisible(false);
   ui_->playlist->addAction(playlist_skip_);
 
   playlist_menu_->addSeparator();
@@ -1504,6 +1502,14 @@ void MainWindow::AddToPlaylist(QAction *action) {
 
 }
 
+void MainWindow::PlaylistMenuHidden() {
+
+  playlist_queue_->setVisible(true);
+  playlist_queue_play_next_->setVisible(true);
+  playlist_skip_->setVisible(true);
+
+}
+
 void MainWindow::PlaylistRightClick(const QPoint &global_pos, const QModelIndex &index) {
 
   QModelIndex source_index = app_->playlist_manager()->current()->proxy()->mapToSource(index);
diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h
index 8f42de0cc..32d79a5ec 100644
--- a/src/core/mainwindow.h
+++ b/src/core/mainwindow.h
@@ -126,7 +126,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
   void Activate();
   bool LoadUrl(const QString& url);
 
-signals:
+ signals:
   void AlbumCoverReady(const Song &song, const QUrl &cover_url, const QImage &image);
   void SearchCoverInProgress();
   // Signals that stop playing after track was toggled.
@@ -146,6 +146,7 @@ signals:
   void TrackSkipped(PlaylistItemPtr item);
   void ForceShowOSD(const Song& song, const bool toggle);
 
+  void PlaylistMenuHidden();
   void PlaylistRightClick(const QPoint& global_pos, const QModelIndex& index);
   void PlaylistCurrentChanged(const QModelIndex& current);
   void PlaylistViewSelectionModelChanged();