diff --git a/html/pages/graphs.inc.php b/html/pages/graphs.inc.php
index dcef1cb0cb..2e6e33b29f 100644
--- a/html/pages/graphs.inc.php
+++ b/html/pages/graphs.inc.php
@@ -108,7 +108,7 @@ else {
     echo('</tr></table>');
 
     $graph_array = $vars;
-    $graph_array['height'] = "300";
+    $graph_array['height'] = $config['webui']['min_graph_height'];
     $graph_array['width']  = $graph_width;
 
     if($_SESSION['screen_width']) {
@@ -125,7 +125,7 @@ else {
             $graph_array['height'] = ($_SESSION['screen_height'] - ($_SESSION['screen_height']/2));
         }
         else {
-            $graph_array['height'] = ($_SESSION['screen_height'] - ($_SESSION['screen_height']/1.5));
+            $graph_array['height'] = max($graph_array['height'],($_SESSION['screen_height'] - ($_SESSION['screen_height']/1.5)));
         }
     }
 
diff --git a/html/pages/settings/webui.inc.php b/html/pages/settings/webui.inc.php
index a5b6bf7f24..2878df2540 100644
--- a/html/pages/settings/webui.inc.php
+++ b/html/pages/settings/webui.inc.php
@@ -11,11 +11,19 @@ $search_conf = array(
     ),
 );
 
+$graph_conf = array(
+    array('name'               => 'webui.min_graph_height',
+          'descr'              => 'Set the minimum graph height',
+          'type'               => 'text',
+    ),
+);
+
 echo '
 <div class="panel-group" id="accordion">
     <form class="form-horizontal" role="form" action="" method="post">
 ';
 
+echo generate_dynamic_config_panel('Graph settings',true,$config_groups,$graph_conf);
 echo generate_dynamic_config_panel('Search settings',true,$config_groups,$search_conf);
 
 echo '
diff --git a/sql-schema/114.sql b/sql-schema/114.sql
new file mode 100644
index 0000000000..7b245ccc6e
--- /dev/null
+++ b/sql-schema/114.sql
@@ -0,0 +1 @@
+INSERT INTO `config` (`config_name`,`config_value`,`config_default`,`config_descr`,`config_group`,`config_group_order`,`config_sub_group`,`config_sub_group_order`,`config_hidden`,`config_disabled`) VALUES ('webui.min_graph_height','300','300','Minimum Graph Height','webui',0,'graph',0,'1','0');
\ No newline at end of file