diff --git a/ground/gcs/src/plugins/config/configgadgetwidget.cpp b/ground/gcs/src/plugins/config/configgadgetwidget.cpp
index 51c852023..92208069b 100644
--- a/ground/gcs/src/plugins/config/configgadgetwidget.cpp
+++ b/ground/gcs/src/plugins/config/configgadgetwidget.cpp
@@ -56,6 +56,8 @@
 #include <QMessageBox>
 #include <QDebug>
 
+#define ALWAYS_SHOW_OPLM 1
+
 ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
 {
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@@ -127,6 +129,15 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
     static_cast<ConfigTaskWidget *>(widget)->bind();
     stackWidget->insertTab(ConfigGadgetWidget::TxPid, widget, *icon, QString("TxPID"));
 
+#ifdef ALWAYS_SHOW_OPLM
+    icon   = new QIcon();
+    icon->addFile(":/configgadget/images/pipx-normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/pipx-selected.png", QSize(), QIcon::Selected, QIcon::Off);
+    widget = new ConfigOPLinkWidget(this);
+    static_cast<ConfigTaskWidget *>(widget)->bind();
+    stackWidget->insertTab(ConfigGadgetWidget::OPLink, widget, *icon, QString("OPLink"));
+#endif
+
     stackWidget->setCurrentIndex(ConfigGadgetWidget::Hardware);
 
     // connect to autopilot connection events
@@ -232,6 +243,7 @@ void ConfigGadgetWidget::onOPLinkConnect()
 {
     qDebug() << "ConfigGadgetWidget::onOPLinkConnect";
 
+#ifndef ALWAYS_SHOW_OPLM
     ConfigTaskWidget *widget;
     QIcon *icon;
 
@@ -241,16 +253,19 @@ void ConfigGadgetWidget::onOPLinkConnect()
     widget = new ConfigOPLinkWidget(this);
     widget->bind();
     stackWidget->insertTab(ConfigGadgetWidget::OPLink, widget, *icon, QString("OPLink"));
+#endif
 }
 
 void ConfigGadgetWidget::onOPLinkDisconnect()
 {
     qDebug() << "ConfigGadgetWidget::onOPLinkDisconnect";
 
+#ifndef ALWAYS_SHOW_OPLM
     if (stackWidget->currentIndex() == ConfigGadgetWidget::OPLink) {
         stackWidget->setCurrentIndex(0);
     }
     stackWidget->removeTab(ConfigGadgetWidget::OPLink);
+#endif
 }
 
 void ConfigGadgetWidget::tabAboutToChange(int i, bool *proceed)