diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp
index 859e980ca..55077d460 100644
--- a/src/lib/preferences/preferences.cpp
+++ b/src/lib/preferences/preferences.cpp
@@ -479,6 +479,12 @@ void Preferences::showStackedPage(QListWidgetItem* item)
     if (index == 10) {
         m_pluginsList->load();
     }
+
+    // Update size
+    QWidget* w = ui->stackedWidget->currentWidget();
+    if (w) {
+        w->setMinimumSize(w->sizeHint());
+    }
 }
 
 void Preferences::setNotificationPreviewVisible(bool state)
diff --git a/src/lib/preferences/preferences.ui b/src/lib/preferences/preferences.ui
index 51dd1c867..cd723463f 100644
--- a/src/lib/preferences/preferences.ui
+++ b/src/lib/preferences/preferences.ui
@@ -10,12 +10,6 @@
     <height>500</height>
    </rect>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>800</width>
-    <height>500</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Preferences</string>
   </property>
@@ -159,9 +153,6 @@
      <property name="focusPolicy">
       <enum>Qt::NoFocus</enum>
      </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
      <widget class="QWidget" name="generalPage">
       <layout class="QGridLayout" name="gridLayout_6">
        <item row="4" column="2">
@@ -648,8 +639,8 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tabsPage">
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="0">
         <widget class="QTabWidget" name="tabWidget_3">
          <property name="currentIndex">
           <number>0</number>