diff --git a/dashboard-ui/scripts/actionsheet.js b/dashboard-ui/scripts/actionsheet.js
index 7ce7e3f05c..ff2d4827ae 100644
--- a/dashboard-ui/scripts/actionsheet.js
+++ b/dashboard-ui/scripts/actionsheet.js
@@ -106,7 +106,8 @@
         var dlg = paperDialogHelper.createDialog({
             modal: false,
             entryAnimationDuration: 160,
-            exitAnimationDuration: 200
+            exitAnimationDuration: 200,
+            enableHistory: options.enableHistory
         });
         dlg.innerHTML = html;
 
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 1e18f9ab9d..8d6e2c59ff 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -125,6 +125,8 @@
 
                 actionsheet.show({
                     items: menuItems,
+                    // history.back() will cause the video player to stop
+                    enableHistory: false,
                     positionTo: $('.videoSubtitleButton')[0],
                     callback: function (id) {
 
@@ -176,6 +178,8 @@
                 selectedId = selectedId.length ? selectedId[0].bitrate : null;
                 actionsheet.show({
                     items: menuItems,
+                    // history.back() will cause the video player to stop
+                    enableHistory: false,
                     positionTo: $('.videoQualityButton')[0],
                     callback: function (id) {
 
@@ -240,6 +244,8 @@
 
                 actionsheet.show({
                     items: menuItems,
+                    // history.back() will cause the video player to stop
+                    enableHistory: false,
                     positionTo: $('.videoAudioButton')[0],
                     callback: function (id) {