diff --git a/TODO.txt b/TODO.txt
index c33834fb6..ef4d189fb 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -63,7 +63,7 @@ GUI
 0013 [ ]    new design, new icons, minimal UI (from purplehaze420) comment: use webui as base for minimal ui
             cyril: we cannot change everything now. But purplehaze420 said he would provide a consistent set of icons. That would be great.
 
-0014 [ ]    go to Settings -> Permissions: wait for scrollbars to appear go back to any other setting (e.g. Notify): the page now 
+0014 [X]    go to Settings -> Permissions: wait for scrollbars to appear go back to any other setting (e.g. Notify): the page now 
             needs the same space as the permission matrix (happens on windows + linux; can be "fixed" by closing and reopen the setting window)
             (from sehraf)
 
diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui b/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui
index e0144f137..488ba9518 100644
--- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui
+++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui
@@ -11,6 +11,46 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>619</width>
+        <height>280</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <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>
+        <widget class="RSPermissionMatrixWidget" name="frame"/>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -52,22 +92,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="RSPermissionMatrixWidget" name="frame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>