diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp
index da8e76f1..50f6e574 100644
--- a/qt/OpenRGBDialog2.cpp
+++ b/qt/OpenRGBDialog2.cpp
@@ -1963,6 +1963,7 @@ void Ui::OpenRGBDialog2::TogglePluginsVisibility(int tab_idx, QTabWidget* tabBar
         if((i != tab_idx) && (dynamic_cast<OpenRGBPluginContainer*>(tab) != nullptr))
         {
             ((OpenRGBPluginContainer*) tab)->Hide();
+            ui->MainButtonsFrame->setVisible(true);
         }
     }
 
@@ -1978,6 +1979,7 @@ void Ui::OpenRGBDialog2::TogglePluginsVisibility(int tab_idx, QTabWidget* tabBar
     if(dynamic_cast<OpenRGBPluginContainer*>(tab) != nullptr)
     {
         ((OpenRGBPluginContainer*) tab)->Show();
+        ui->MainButtonsFrame->setVisible(false);
     }
 }
 
diff --git a/qt/OpenRGBDialog2.ui b/qt/OpenRGBDialog2.ui
index d5bf4760..e7864802 100644
--- a/qt/OpenRGBDialog2.ui
+++ b/qt/OpenRGBDialog2.ui
@@ -82,52 +82,76 @@
     <item row="6" column="0" colspan="5">
      <layout class="QHBoxLayout" name="MainButtonsLayout">
       <item>
-       <widget class="QPushButton" name="ButtonToggleDeviceView">
-        <property name="text">
-         <string>Toggle LED View</string>
+       <widget class="QFrame" name="MainButtonsFrame">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
         </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_5">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QPushButton" name="ButtonToggleDeviceView">
+           <property name="text">
+            <string>Toggle LED View</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QPushButton" name="ButtonRescan">
+           <property name="text">
+            <string>Rescan Devices</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2">
+          <widget class="QToolButton" name="ButtonSaveProfile">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Save Profile</string>
+           </property>
+           <property name="popupMode">
+            <enum>QToolButton::MenuButtonPopup</enum>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="3">
+          <widget class="QPushButton" name="ButtonDeleteProfile">
+           <property name="text">
+            <string>Delete Profile</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="4">
+          <widget class="QPushButton" name="ButtonLoadProfile">
+           <property name="text">
+            <string>Load Profile</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="5">
+          <widget class="QComboBox" name="ProfileBox"/>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item>
-       <widget class="QPushButton" name="ButtonRescan">
-        <property name="text">
-         <string>Rescan Devices</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="ButtonSaveProfile">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Save Profile</string>
-        </property>
-        <property name="popupMode">
-         <enum>QToolButton::MenuButtonPopup</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ButtonDeleteProfile">
-        <property name="text">
-         <string>Delete Profile</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ButtonLoadProfile">
-        <property name="text">
-         <string>Load Profile</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="ProfileBox"/>
-      </item>
      </layout>
     </item>
     <item row="4" column="0" colspan="5">