diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp
index 9e157fa..12c788b 100644
--- a/Software/PC_Application/appwindow.cpp
+++ b/Software/PC_Application/appwindow.cpp
@@ -586,6 +586,8 @@ void AppWindow::SetupSCPI()
         }
         if(mode) {
             mode->activate();
+            int index = modeHandler->findIndex(mode);
+            modeHandler->setCurrentIndex(index);
             return SCPI::getResultName(SCPI::Result::Empty);
         } else {
             return SCPI::getResultName(SCPI::Result::Error);