diff --git a/sdrgui/gui/workspace.cpp b/sdrgui/gui/workspace.cpp
index 143dde748..eb0652ccc 100644
--- a/sdrgui/gui/workspace.cpp
+++ b/sdrgui/gui/workspace.cpp
@@ -30,6 +30,7 @@
 
 #include "gui/samplingdevicedialog.h"
 #include "gui/rollupcontents.h"
+#include "gui/buttonswitch.h"
 #include "channel/channelgui.h"
 #include "feature/featuregui.h"
 #include "device/devicegui.h"
@@ -117,7 +118,8 @@ Workspace::Workspace(int index, QWidget *parent, Qt::WindowFlags flags) :
     m_stackSubWindows->setToolTip("Stack sub windows");
     m_stackSubWindows->setFixedSize(20, 20);
 
-    m_autoStackSubWindows = new QPushButton("AS");
+    m_autoStackSubWindows = new ButtonSwitch();
+    m_autoStackSubWindows->setText("AS");
     m_autoStackSubWindows->setCheckable(true);
     //QIcon autoStackSubWindowsIcon(":/autostack.png"); // FIXME
     //m_autoStackSubWindows->setIcon(autoStackSubWindowsIcon);
diff --git a/sdrgui/gui/workspace.h b/sdrgui/gui/workspace.h
index a12762253..5f23e9cbb 100644
--- a/sdrgui/gui/workspace.h
+++ b/sdrgui/gui/workspace.h
@@ -31,6 +31,7 @@ class QStringList;
 class QMdiArea;
 class QMdiSubWindow;
 class QFrame;
+class ButtonSwitch;
 class ChannelGUI;
 class FeatureGUI;
 class DeviceGUI;
@@ -71,7 +72,7 @@ private:
     QPushButton *m_cascadeSubWindows;
     QPushButton *m_tileSubWindows;
     QPushButton *m_stackSubWindows;
-    QPushButton *m_autoStackSubWindows;
+    ButtonSwitch *m_autoStackSubWindows;
     QWidget *m_titleBar;
     QHBoxLayout *m_titleBarLayout;
     QLabel *m_titleLabel;