diff --git a/src/blackgui/components/cockpitcomcomponent.ui b/src/blackgui/components/cockpitcomcomponent.ui
index 9362550ac..16b9ed56b 100644
--- a/src/blackgui/components/cockpitcomcomponent.ui
+++ b/src/blackgui/components/cockpitcomcomponent.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>CCockpitMainComponent</class>
  <widget class="QFrame" name="CCockpitMainComponent">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>292</width>
+    <height>96</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>Cockpit COM</string>
   </property>
@@ -511,6 +519,12 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>BlackGui::Components::CSelcalCodeSelector</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/selcalcodeselector.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>BlackGui::CLedWidget</class>
    <extends>QWidget</extends>
@@ -527,12 +541,6 @@
    <extends>QSpinBox</extends>
    <header>blackgui/components/transpondercodespinbox.h</header>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CSelcalCodeSelector</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/selcalcodeselector.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CCockpitTransponderModeLedsComponent</class>
    <extends>QFrame</extends>
@@ -540,6 +548,17 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>ds_ComPanelCom1Active</tabstop>
+  <tabstop>ds_ComPanelCom2Active</tabstop>
+  <tabstop>sbp_ComPanelTransponder</tabstop>
+  <tabstop>cbp_ComPanelTransponderMode</tabstop>
+  <tabstop>ds_ComPanelCom1Standby</tabstop>
+  <tabstop>ds_ComPanelCom2Standby</tabstop>
+  <tabstop>pb_ComPanelCom1Toggle</tabstop>
+  <tabstop>pb_ComPanelCom2Toggle</tabstop>
+  <tabstop>pb_ComPanelSelcalTest</tabstop>
+ </tabstops>
  <resources>
   <include location="../../blackmisc/blackmisc.qrc"/>
  </resources>
diff --git a/src/blackgui/managedstatusbar.cpp b/src/blackgui/managedstatusbar.cpp
index ad423f956..e3ebe899c 100644
--- a/src/blackgui/managedstatusbar.cpp
+++ b/src/blackgui/managedstatusbar.cpp
@@ -24,7 +24,6 @@ using namespace BlackMisc;
 
 namespace BlackGui
 {
-
     CManagedStatusBar::CManagedStatusBar(QObject *parent) : QObject(parent)
     {
         this->setObjectName("qo_ManagedStatusBar");
@@ -74,6 +73,7 @@ namespace BlackGui
             sizePolicy.setVerticalStretch(0);
             sizePolicy.setHeightForWidth(this->m_statusBar->sizePolicy().hasHeightForWidth());
 
+            this->m_statusBar->setMinimumHeight(24); // with no minimum height the layout always adjustes when displaying a status message
             this->m_statusBar->setSizePolicy(sizePolicy);
             this->m_statusBar->setSizeGripEnabled(false);
         }
diff --git a/src/blackgui/managedstatusbar.h b/src/blackgui/managedstatusbar.h
index 9aefd37dd..6e2212fd9 100644
--- a/src/blackgui/managedstatusbar.h
+++ b/src/blackgui/managedstatusbar.h
@@ -31,7 +31,6 @@ namespace BlackGui
         Q_OBJECT
 
     public:
-
         //! Constructor
         explicit CManagedStatusBar(QObject *parent = nullptr);