diff --git a/include/js/jquery.multiselect.filter.js b/include/js/jquery.multiselect.filter.js
index d1a859919b..0b047e46e8 100644
--- a/include/js/jquery.multiselect.filter.js
+++ b/include/js/jquery.multiselect.filter.js
@@ -34,6 +34,7 @@
   var optgroupClass = 'ui-multiselect-optgroup';
   var groupLabelClass = 'ui-multiselect-grouplabel';
   var hiddenClass = 'ui-multiselect-excluded';
+  var searchClass = 'ui-state-default ui-corner-all';
 
   /**
    * This comes courtesy of underscore.js
@@ -62,7 +63,6 @@
   }
 
   $.widget('ech.multiselectfilter', {
-
     options: {
       label: 'Filter:', // (string) The label to show with the input
       placeholder: 'Enter keywords', // (string) The placeholder text to show in the input
@@ -102,7 +102,8 @@
         .css({width: (typeof opts.width === 'string')
                        ? this.instance._parse2px(opts.width, this.$header).px + 'px'
                        : (/\d/.test(opts.width) ? opts.width + 'px' : null),
-             });
+             })
+		.addClass(searchClass);
       this._bindInputEvents();
       // automatically reset the widget on close?
       if (this.options.autoReset) {
diff --git a/include/layout.js b/include/layout.js
index fd3707feb1..a00c4153c6 100644
--- a/include/layout.js
+++ b/include/layout.js
@@ -3539,6 +3539,15 @@ function setSelectMenus() {
 
 	var msWidth = 200;
 
+	$('#graph_template_id option').each(function() {
+		var curWidth = $(this).textWidth();
+		if (curWidth > msWidth) {
+			msWidth = curWidth;
+		}
+	});
+
+	msWidth -= 20;
+
 	$('#graph_template_id.graph-multiselect').hide().multiselect({
 		menuHeight: $(window).height()*.7,
 		menuWidth: 'auto',
diff --git a/include/themes/dark/main.css b/include/themes/dark/main.css
index 97d5e0c89d..5867563b43 100644
--- a/include/themes/dark/main.css
+++ b/include/themes/dark/main.css
@@ -2517,6 +2517,11 @@ tr#realtime td:first-child {
 	font-size: unset;
 }
 
+.ui-widget-header {
+	background: transparent;
+	background-color: #161616;
+}
+
 .ui-checkboxradio-icon {
 	display: none;
 }