diff --git a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
index 5aa2ac295..913efe609 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'layoutManager', 'globalize', 'emby-button', 'css!./actionsheet', 'material-icons', 'scrollStyles'], function (dialogHelper, layoutManager, globalize) {
+define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'emby-button', 'css!./actionsheet', 'material-icons', 'scrollStyles'], function (dialogHelper, layoutManager, globalize, browser) {
 
     function parentWithClass(elem, className) {
 
@@ -142,8 +142,8 @@
         }
 
         var scrollType = layoutManager.desktop ? 'smoothScrollY' : 'hiddenScrollY';
-
-        html += '<div class="actionSheetScroller ' + scrollType + '">';
+        var style = (browser.noFlex || browser.firefox) ? ' style="max-height:400px;"' : '';
+        html += '<div class="actionSheetScroller ' + scrollType + '"' + style + '>';
 
         var i, length, option;
         var renderIcon = false;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
index dfe5857e4..689f82d61 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
@@ -60,6 +60,7 @@
 
     [is="emby-button"].noflex {
         display: inline-block;
+        white-space: nowrap;
     }
 
     [is="emby-button"].fab.mini:not(.autoSize) {