diff --git a/src/context/contextview.h b/src/context/contextview.h
index 6335b9750..324f62d68 100644
--- a/src/context/contextview.h
+++ b/src/context/contextview.h
@@ -28,12 +28,12 @@
 #include <QList>
 #include <QString>
 #include <QImage>
+#include <QAction>
 
 #include "core/song.h"
 #include "contextalbum.h"
 
 class QMenu;
-class QAction;
 class QLabel;
 class QStackedWidget;
 class QVBoxLayout;
@@ -61,7 +61,7 @@ class ContextView : public QWidget {
 
   ContextAlbum *album_widget() const { return widget_album_; }
   ContextAlbumsView *albums_widget() const { return widget_albums_; }
-  bool album_enabled() const { return widget_album_->isVisible(); }
+  bool album_enabled() const { return action_show_album_->isChecked(); }
   Song song_playing() const { return song_playing_; }
 
  protected:
diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index cc3c05b0b..509815aac 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -1177,7 +1177,7 @@ void MainWindow::TrackSkipped(PlaylistItemPtr item) {
 
 void MainWindow::TabSwitched() {
 
-  if (playing_widget_ && ui_->sidebar_layout->isVisible() && (ui_->tabs->tabBar()->tabData(ui_->tabs->currentIndex()).toString().toLower() != "context" || !context_view_->album_enabled())) {
+  if (playing_widget_ && ui_->action_toggle_show_sidebar->isChecked() && (ui_->tabs->tabBar()->tabData(ui_->tabs->currentIndex()).toString().toLower() != "context" || !context_view_->album_enabled())) {
     ui_->widget_playing->SetEnabled();
   }
   else {