diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
index f19b414c4..d8c2ea02e 100644
--- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
@@ -51,11 +51,11 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
 {
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
-    ftw = new FancyTabWidget(this, true);
-
+    ftw = new MyTabbedStackWidget(this, true, true);
     ftw->setIconSize(64);
 
     QVBoxLayout *layout = new QVBoxLayout;
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(ftw);
     setLayout(layout);
 
diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
index 43db58429..ee293db5f 100644
--- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
@@ -38,7 +38,8 @@
 #include <QTextBrowser>
 #include "utils/pathutils.h"
 
-#include "fancytabwidget.h"
+//#include "fancytabwidget.h"
+#include "utils/mytabbedstackwidget.h"
 
 
 class ConfigGadgetWidget: public QWidget
@@ -60,8 +61,7 @@ signals:
 
 protected:
         void resizeEvent(QResizeEvent * event);
-        FancyTabWidget *ftw;
-
+        MyTabbedStackWidget *ftw;
 };
 
 #endif // CONFIGGADGETWIDGET_H