diff --git a/js/navigation.js b/js/navigation.js
index 40192bff8a..4b24e37545 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -1301,9 +1301,12 @@ var ResizeHandler = function () {
         var $nav_tree   = $('#pma_navigation_tree');
         var $nav_header = $('#pma_navigation_header');
         var $nav_tree_content = $('#pma_navigation_tree_content');
-        $nav_tree.height($nav.height() - $nav_header.height());
+				var height = ($nav.height() - $nav_header.height());
+
+				height = height > 50 ? height : 800; //keep min. height
+        $nav_tree.height(height);
         if ($nav_tree_content.length > 0) {
-            $nav_tree_content.height($nav_tree.height() - $nav_tree_content.position().top);
+            $nav_tree_content.height(height - $nav_tree_content.position().top);
         } else {
             // TODO: in fast filter search response there is no #pma_navigation_tree_content, needs to be added in php
             $nav_tree.css({