diff --git a/nitrokeyapp/ui/secrets_tab.ui b/nitrokeyapp/ui/secrets_tab.ui
index 49b7dfe4..1bdd703f 100644
--- a/nitrokeyapp/ui/secrets_tab.ui
+++ b/nitrokeyapp/ui/secrets_tab.ui
@@ -24,10 +24,10 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0">
    <property name="leftMargin">
-     <number>4</number>
-   </property>   
+    <number>4</number>
+   </property>
    <property name="topMargin">
-     <number>4</number>
+    <number>4</number>
    </property>
    <item>
     <widget class="QStackedWidget" name="secret_tab">
@@ -45,36 +45,21 @@
        <property name="leftMargin">
         <number>4</number>
        </property>
+       <property name="topMargin">
+        <number>4</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
        <property name="bottomMargin">
         <number>4</number>
        </property>
        <property name="horizontalSpacing">
-        <number>3</number>
-       </property>
-       <property name="topMargin">
         <number>4</number>
        </property>
-       <item row="0" column="0">
-        <widget class="QListWidget" name="secrets_list">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>180</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>11</pointsize>
-          </font>
-         </property>
-        </widget>
-       </item>
+       <property name="verticalSpacing">
+        <number>6</number>
+       </property>
        <item row="2" column="0">
         <widget class="QWidget" name="__button_space_left" native="true">
          <property name="sizePolicy">
@@ -126,9 +111,12 @@
             <property name="orientation">
              <enum>Qt::Orientation::Horizontal</enum>
             </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Policy::Fixed</enum>
+            </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>63</width>
+              <width>80</width>
               <height>20</height>
              </size>
             </property>
@@ -788,6 +776,33 @@
          </layout>
         </widget>
        </item>
+       <item row="0" column="0">
+        <widget class="QListWidget" name="secrets_list">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>180</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>260</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_incompatible">
diff --git a/nitrokeyapp/ui/settings_tab.ui b/nitrokeyapp/ui/settings_tab.ui
index 07014212..67286398 100644
--- a/nitrokeyapp/ui/settings_tab.ui
+++ b/nitrokeyapp/ui/settings_tab.ui
@@ -24,10 +24,10 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_3">
    <property name="leftMargin">
-     <number>4</number>
+    <number>4</number>
    </property>
    <property name="topMargin">
-     <number>4</number>
+    <number>4</number>
    </property>
    <item>
     <widget class="QStackedWidget" name="settings_tab">
@@ -45,15 +45,21 @@
        <property name="leftMargin">
         <number>4</number>
        </property>
+       <property name="topMargin">
+        <number>4</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
        <property name="bottomMargin">
         <number>4</number>
        </property>
        <property name="horizontalSpacing">
-        <number>3</number>
-       </property>
-       <property name="topMargin">
         <number>4</number>
        </property>
+       <property name="verticalSpacing">
+        <number>6</number>
+       </property>
        <item row="0" column="0">
         <widget class="QTreeWidget" name="settings_tree">
          <property name="sizePolicy">
@@ -68,6 +74,18 @@
            <height>0</height>
           </size>
          </property>
+         <property name="maximumSize">
+          <size>
+           <width>260</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="baseSize">
+          <size>
+           <width>260</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="font">
           <font>
            <pointsize>11</pointsize>
@@ -212,16 +230,16 @@
            <number>0</number>
           </property>
           <item>
-           <spacer name="__horizontal_spacer">
+           <spacer name="__horizontalSpacer2">
             <property name="orientation">
              <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>260</width>
+              <width>258</width>
               <height>20</height>
              </size>
             </property>