diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 6caf59bec2..0536d07341 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -229,8 +229,8 @@
     function onMainDrawerSelect(e) {
 
         var drawer = e.target;
-        if (drawer.selected == 'main') {
 
+        if (drawer.selected != 'drawer') {
             document.body.classList.remove('bodyWithPopupOpen');
             document.querySelector('.mainDrawerPanel #drawer').classList.remove('verticalScrollingDrawer');
         } else {
@@ -1061,9 +1061,8 @@ $.fn.createHoverTouch = function () {
 
     var isCurrentNavBack = false;
 
-    window.addEventListener("navigate", function (e) {
-
-        var data = e.detail.state || {};
+    $(window).on("navigate", function (e, data) {
+        data = data.state || {};
         isCurrentNavBack = data.direction == 'back';
     });
 
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js
index 801056b352..6f820776b4 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js
@@ -113,6 +113,15 @@
 			this._on(this.document, { "focusin": "_handleDocumentFocusIn" });
 		},
 
+		_delay: function (handler, delay) {
+		    function handlerProxy() {
+		        return (typeof handler === "string" ? instance[handler] : handler)
+                    .apply(instance, arguments);
+		    }
+		    var instance = this;
+		    return setTimeout(handlerProxy, delay || 0);
+		},
+
 		_enhance: function (theElement, myId) {
 			var currentOptions = this.options,
 				wrapperClass = currentOptions.wrapperClass,
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
index 493d3b47f7..2f9e165c28 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
@@ -1457,39 +1457,6 @@
                 element.unbind(eventName).undelegate(eventName);
             },
 
-            _delay: function (handler, delay) {
-                function handlerProxy() {
-                    return (typeof handler === "string" ? instance[handler] : handler)
-                        .apply(instance, arguments);
-                }
-                var instance = this;
-                return setTimeout(handlerProxy, delay || 0);
-            },
-
-            _hoverable: function (element) {
-                this.hoverable = this.hoverable.add(element);
-                this._on(element, {
-                    mouseenter: function (event) {
-                        $(event.currentTarget).addClass("ui-state-hover");
-                    },
-                    mouseleave: function (event) {
-                        $(event.currentTarget).removeClass("ui-state-hover");
-                    }
-                });
-            },
-
-            _focusable: function (element) {
-                this.focusable = this.focusable.add(element);
-                this._on(element, {
-                    focusin: function (event) {
-                        $(event.currentTarget).addClass("ui-state-focus");
-                    },
-                    focusout: function (event) {
-                        $(event.currentTarget).removeClass("ui-state-focus");
-                    }
-                });
-            },
-
             _trigger: function (type, event, data) {
                 var prop, orig,
                     callback = this.options[type];