diff --git a/app/views/play/menu/InventoryModal.coffee b/app/views/play/menu/InventoryModal.coffee
index e797b30eb..03927dc83 100644
--- a/app/views/play/menu/InventoryModal.coffee
+++ b/app/views/play/menu/InventoryModal.coffee
@@ -497,7 +497,9 @@ module.exports = class InventoryModal extends ModalView
     @playSound 'menu-button-click'
     @showLoading()
     ua = navigator.userAgent.toLowerCase()
-    unless me.isAdmin() or hasGoneFullScreenOnce and (/safari/.test(ua) and not /chrome/.test(ua)) or $(window).height() >= 658  # Min vertical resolution needed at 1366px wide
+    isSafari = /safari/.test(ua) and not /chrome/.test(ua)
+    isTooShort = $(window).height() < 658  # Min vertical resolution needed at 1366px wide
+    if isTooShort and not me.isAdmin() and not hasGoneFullScreenOnce and not isSafari
       @toggleFullscreen()
       hasGoneFullScreenOnce = true
     @updateConfig =>