diff --git a/src/components/navdrawer/navdrawer.js b/src/components/navdrawer/navdrawer.js
index 33e976fe09..fdd81154af 100644
--- a/src/components/navdrawer/navdrawer.js
+++ b/src/components/navdrawer/navdrawer.js
@@ -114,12 +114,17 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function (browser,
                 countStart++;
                 var deltaX = endX - (backgroundTouchStartX || 0);
 
-                if (1 === countStart && (startPoint = deltaX), deltaX < 0 && 2 !== dragMode) {
-                    dragMode = 1;
-                    newPos = deltaX - startPoint + options.width;
-                    self.changeMenuPos();
-                    var time = new Date().getTime() - (backgroundTouchStartTime || 0);
-                    velocity = Math.abs(deltaX) / time;
+                if (countStart == 1) {
+                    startPoint = deltaX;
+                }
+                if (deltaX < 0) {
+                    if (dragMode !== 2) {
+                        dragMode = 1;
+                        newPos = deltaX - startPoint + options.width;
+                        self.changeMenuPos();
+                        var time = new Date().getTime() - (backgroundTouchStartTime || 0);
+                        velocity = Math.abs(deltaX) / time;
+                    }
                 }
             }
 
@@ -262,6 +267,7 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function (browser,
         };
 
         TouchMenuLA.prototype.hideMask = function () {
+            mask.classList.add("hide");
             mask.classList.remove("backdrop");
         };
 
diff --git a/src/controllers/dashboard/networking.js b/src/controllers/dashboard/networking.js
index 97383dfd48..b9f990d629 100644
--- a/src/controllers/dashboard/networking.js
+++ b/src/controllers/dashboard/networking.js
@@ -9,7 +9,8 @@ define(["loading", "libraryMenu", "globalize", "emby-checkbox", "emby-select"],
             var validationResult = getValidationAlert(form);
 
             if (validationResult) {
-                return void alertText(validationResult);
+                alertText(validationResult);
+                return;
             }
 
             validateHttps(form).then(function () {