diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css
index 6308edd8c..8d60de4b5 100644
--- a/airtime_mvc/public/css/dashboard.css
+++ b/airtime_mvc/public/css/dashboard.css
@@ -165,6 +165,7 @@ thead th.ui-state-default:focus {
     left: -420px;
     padding: 5px;
     margin-top: -2px;
+    z-index: 1005;
 }
 
 #advanced_search label, #advanced_search span {
@@ -190,7 +191,7 @@ thead th.ui-state-default:focus {
 
 #advanced-options {
     float: right;
-    z-index: 1;
+    z-index: 1004;
 }
 
 #advanced-options > button {
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index b21be403b..4d4ed65bb 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -3525,6 +3525,10 @@ button.btn-icon-text > i.icon-white {
     flex-flow: row wrap;
 }
 
+.ui-dialog-content input {
+    z-index: 1003;
+}
+
 .ui-dialog-content .media_type_selector {
     padding-left: 0;
     flex: 1 auto;
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index d0f85d76a..62bba1435 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -115,42 +115,52 @@ var AIRTIME = (function(AIRTIME) {
 
     mod.createToolbarButtons = function () {
         $menu = $("<div class='btn-toolbar' />");
-        $menu
-            .append("<div class='btn-group' title=" + $.i18n._('New') + ">" +
-            "<button class='btn btn-small' id='sb-new'>" +
-            "<i class='icon-white icon-plus'></i>" +
-            "<span>" + $.i18n._('New') + "</span>" +
-            "</button>" +
-            "</div>")
-            .append("<div class='btn-group' title=" + $.i18n._('Edit') + ">" +
-            "<button class='btn btn-small' id='sb-edit'>" +
-            "<i class='icon-white icon-pencil'></i>" +
-            "<span>" + $.i18n._('Edit') + "</span>" +
-            "</button>" +
-            "</div>")
+        if ($(".ui-dialog-content").length === 0) {
+            $menu
+                .append(
+                    "<div class='btn-group' title=" + $.i18n._('New') + ">" +
+                        "<button class='btn btn-small' id='sb-new'>" +
+                            "<i class='icon-white icon-plus'></i>" +
+                            "<span>" + $.i18n._('New') + "</span>" +
+                        "</button>" +
+                    "</div>"
+                ).append(
+                    "<div class='btn-group' title=" + $.i18n._('Edit') + ">" +
+                        "<button class='btn btn-small' id='sb-edit'>" +
+                            "<i class='icon-white icon-pencil'></i>" +
+                            "<span>" + $.i18n._('Edit') + "</span>" +
+                        "</button>" +
+                    "</div>"
+                );
+        }
 
-            .append("<div class='btn-group'>" +
-            "<button class='btn btn-small' id='library-plus'>" +
-            "<i class='icon-white icon-plus'></i>" +
-            "<span id='lib-plus-text'></span>" +
-            "</button>" +
-            "</div>")
-            .append("<div class='btn-group' title=" + $.i18n._('Delete') + ">" +
-            "<button class='btn btn-small btn-danger' id='sb-trash'>" +
-            "<i class='icon-white icon-trash'></i>" +
-            "<span>" + $.i18n._('Delete') + "</span>" +
-            "</button>" +
-            "</div>")
-            .append("<div class='btn-group'>" +
-            "<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" +
-            $.i18n._("Select") + " <span class='caret'></span>" +
-            "</button>" +
-            "<ul class='dropdown-menu'>" +
-            "<li id='sb-select-page'><a href='#'>" + $.i18n._("Select this page") + "</a></li>" +
-            "<li id='sb-dselect-page'><a href='#'>" + $.i18n._("Deselect this page") + "</a></li>" +
-            "<li id='sb-dselect-all'><a href='#'>" + $.i18n._("Deselect all") + "</a></li>" +
-            "</ul>" +
-            "</div>");
+        $menu
+            .append(
+                "<div class='btn-group'>" +
+                    "<button class='btn btn-small' id='library-plus'>" +
+                        "<i class='icon-white icon-plus'></i>" +
+                        "<span id='lib-plus-text'></span>" +
+                    "</button>" +
+                "</div>"
+            ).append(
+                "<div class='btn-group' title=" + $.i18n._('Delete') + ">" +
+                    "<button class='btn btn-small btn-danger' id='sb-trash'>" +
+                        "<i class='icon-white icon-trash'></i>" +
+                        "<span>" + $.i18n._('Delete') + "</span>" +
+                    "</button>" +
+                "</div>"
+            ).append(
+                "<div class='btn-group'>" +
+                    "<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" +
+                        $.i18n._("Select") + " <span class='caret'></span>" +
+                    "</button>" +
+                    "<ul class='dropdown-menu'>" +
+                        "<li id='sb-select-page'><a href='#'>" + $.i18n._("Select this page") + "</a></li>" +
+                        "<li id='sb-dselect-page'><a href='#'>" + $.i18n._("Deselect this page") + "</a></li>" +
+                        "<li id='sb-dselect-all'><a href='#'>" + $.i18n._("Deselect all") + "</a></li>" +
+                    "</ul>" +
+                "</div>"
+            );
     };
 
     mod.moveSearchBarToHeader = function() {