diff --git a/src/plugins/baremetal/defaultgdbserverprovider.cpp b/src/plugins/baremetal/defaultgdbserverprovider.cpp
index 72daa756249..0b4230ab33a 100644
--- a/src/plugins/baremetal/defaultgdbserverprovider.cpp
+++ b/src/plugins/baremetal/defaultgdbserverprovider.cpp
@@ -34,6 +34,8 @@
 
 #include <utils/qtcassert.h>
 
+#include <coreplugin/variablechooser.h>
+
 #include <QFormLayout>
 #include <QPlainTextEdit>
 
@@ -162,6 +164,10 @@ DefaultGdbServerProviderConfigWidget::DefaultGdbServerProviderConfigWidget(
     addErrorLabel();
     setFromProvider();
 
+    auto chooser = new Core::VariableChooser(this);
+    chooser->addSupportedWidget(m_initCommandsTextEdit.data());
+    chooser->addSupportedWidget(m_resetCommandsTextEdit.data());
+
     connect(m_hostWidget.data(), &HostWidget::dataChanged,
             this, &GdbServerProviderConfigWidget::dirty);
     connect(m_initCommandsTextEdit.data(), &QPlainTextEdit::textChanged,
diff --git a/src/plugins/baremetal/openocdgdbserverprovider.cpp b/src/plugins/baremetal/openocdgdbserverprovider.cpp
index 5d4bb82d53d..f3f47404a9f 100644
--- a/src/plugins/baremetal/openocdgdbserverprovider.cpp
+++ b/src/plugins/baremetal/openocdgdbserverprovider.cpp
@@ -36,6 +36,8 @@
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>
 
+#include <coreplugin/variablechooser.h>
+
 #include <QString>
 #include <QFileInfo>
 
@@ -287,6 +289,10 @@ OpenOcdGdbServerProviderConfigWidget::OpenOcdGdbServerProviderConfigWidget(
     addErrorLabel();
     setFromProvider();
 
+    auto chooser = new Core::VariableChooser(this);
+    chooser->addSupportedWidget(m_initCommandsTextEdit.data());
+    chooser->addSupportedWidget(m_resetCommandsTextEdit.data());
+
     connect(m_hostWidget.data(), &HostWidget::dataChanged,
             this, &GdbServerProviderConfigWidget::dirty);
     connect(m_executableFileChooser.data(), &Utils::PathChooser::changed,
diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
index d34fa25a0ca..daf70f6d672 100644
--- a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
+++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
@@ -36,6 +36,8 @@
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>
 
+#include <coreplugin/variablechooser.h>
+
 #include <QString>
 #include <QFileInfo>
 
@@ -286,6 +288,10 @@ StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget
     addErrorLabel();
     setFromProvider();
 
+    auto chooser = new Core::VariableChooser(this);
+    chooser->addSupportedWidget(m_initCommandsTextEdit.data());
+    chooser->addSupportedWidget(m_resetCommandsTextEdit.data());
+
     connect(m_hostWidget.data(), &HostWidget::dataChanged,
             this, &GdbServerProviderConfigWidget::dirty);
     connect(m_executableFileChooser.data(), &Utils::PathChooser::changed,