diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py
index 98a597a05..47f2d08c6 100644
--- a/web/pgadmin/browser/__init__.py
+++ b/web/pgadmin/browser/__init__.py
@@ -114,7 +114,18 @@ class BrowserModule(PgAdminModule):
                         filename='js/aciTree/jquery.aciSortable.min'
                         ),
             'deps': ['jquery', 'jquery.aciplugin'],
-            'exports': 'aciPluginClass.plugins.aciTree',
+            'exports': 'aciPluginClass.plugins.aciSortable',
+            'when': None,
+            'preloaded': True
+            })
+        scripts.append({
+            'name': 'jquery.acifragment',
+            'path': url_for(
+                        'browser.static',
+                        filename='js/aciTree/jquery.aciFragment.min'
+                        ),
+            'deps': ['jquery', 'jquery.aciplugin'],
+            'exports': 'aciPluginClass.plugins.aciFragment',
             'when': None,
             'preloaded': True
             })
diff --git a/web/pgadmin/preferences/__init__.py b/web/pgadmin/preferences/__init__.py
index 05a35e1fb..ed84b873b 100644
--- a/web/pgadmin/preferences/__init__.py
+++ b/web/pgadmin/preferences/__init__.py
@@ -91,6 +91,9 @@ def preferences():
     preferences = Preferences.preferences()
     res = []
 
+    def label(p):
+        return p['label']
+
     for m in preferences:
         if len(m['categories']):
             om = {
@@ -108,15 +111,16 @@ def preferences():
                     "label": c['label'],
                     "inode": False,
                     "open": False,
-                    "preferences": c['preferences']
+                    "preferences": sorted(c['preferences'], key=label)
                     }
 
                 (om['branch']).append(oc)
+            om['branch'] = sorted(om['branch'], key=label)
 
             res.append(om)
 
     return ajax_response(
-            response=res,
+            response=sorted(res, key=label),
             status=200
             )
 
diff --git a/web/pgadmin/preferences/static/css/preferences.css b/web/pgadmin/preferences/static/css/preferences.css
index 7946f9049..9f8de62d1 100644
--- a/web/pgadmin/preferences/static/css/preferences.css
+++ b/web/pgadmin/preferences/static/css/preferences.css
@@ -1,11 +1,8 @@
 .preferences_dialog {
   height: 100%;
-  position: absolute;
-  top: 5px;
-  left: 0px;
-  bottom: 0px;
-  right: 0px;
-  padding-bottom: 30px;
+  width: 100%;
+  padding-top: 34px;
+  padding-bottom: 39px;
 }
 
 .preferences_tree{
@@ -23,6 +20,11 @@
   overflow: auto;
 }
 
+div.pgadmin-preference-body div.ajs-content {
+  top: 0px !important;
+  bottom: 0px !important;
+}
+
 .preferences_content .control-label, .preferences_content .pgadmin-controls {
   min-width: 100px !important;
 }