diff --git a/public/less/admin/general/navigation.less b/public/less/admin/general/navigation.less
index 86fd3cae62..3e10639b89 100644
--- a/public/less/admin/general/navigation.less
+++ b/public/less/admin/general/navigation.less
@@ -3,6 +3,8 @@
 		width: 100%;
 		min-height: 50px;
 		border: 1px solid #eee;
+		overflow: auto;
+		
 		.active {
 			background-color: #eee;
 		}
diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index 9ebdce555a..3c4a25f066 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -13,17 +13,22 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 		});
 
 		translator.translate(translator.unescape($('#available').html()), function(html) {
-			$('#available').html(html)
-				.find('li .drag-item').draggable({
-					connectToSortable: '#active-navigation',
-					helper: 'clone',
-					distance: 10,
-					stop: drop
-				});
+			app.loadJQueryUI(function() {
+				$('#available').html(html)
+					.find('li .drag-item').draggable({
+						connectToSortable: '#active-navigation',
+						helper: 'clone',
+						distance: 10,
+						stop: drop
+					});
+			});
 		});
+		
+		app.loadJQueryUI(function() {
 
-		$('#active-navigation').sortable().droppable({
-			accept: $('#available li .drag-item')
+			$('#active-navigation').sortable().droppable({
+				accept: $('#available li .drag-item')
+			});
 		});
 
 		$('#enabled').on('click', '.iconPicker', function() {