diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index fdcf17682..877bea596 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -852,7 +852,7 @@ define([
         var tbState = true;
         common.getAttribute(['general', 'markdown-help'], function (e, data) {
             if (e) { return void console.error(e); }
-            if ($(window).height() < 800) { return; }
+            if ($(window).height() < 800 && $(window).width() < 800) { return; }
             if (data === true && $toolbarButton.length && tbState) {
                 $toolbarButton.click();
             }
@@ -869,7 +869,7 @@ define([
             }
             common.getAttribute(['general', 'markdown-help'], function (e, data) {
                 if (e) { return void console.error(e); }
-                if ($(window).height() < 800) { return; }
+                if ($(window).height() < 800 && $(window).width() < 800) { return; }
                 if (data === true && $toolbarButton) {
                     // Show the toolbar using the button to make sure the icon in the button is
                     // correct (caret-down / caret-up)
@@ -964,7 +964,7 @@ define([
         });
 
         common.getAttribute(['hideHelp', type], function (err, val) {
-            if ($(window).height() < 800) { return void toggleHelp(true); }
+            if ($(window).height() < 800 && $(window).width() < 800) { return void toggleHelp(true); }
             if (val === true) { toggleHelp(true); }
         });
 
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 22e9d5bf3..905551d77 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -400,7 +400,9 @@ define([
         });
         show();
         Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
-            if (val === false || $(window).width() < 800) { return void hide(); }
+            if (val === false || ($(window).height() < 800 && $(window).width() < 800)) {
+                return void hide();
+            }
             show();
         });