diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt
index 1d1b4be60..25067726b 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt
@@ -93,6 +93,20 @@ internal class UIStorageChest : UICanvas(), HasInventory {
         itemListPlayer.rebuild(catBar.catIconsMeaning[catBar.selectedIcon])
     }
 
+    private fun setCompact(yes: Boolean) {
+        itemListChest.isCompactMode = yes
+        itemListChest.gridModeButtons[0].highlighted = !yes
+        itemListChest.gridModeButtons[1].highlighted = yes
+        itemListChest.itemPage = 0
+        itemListChest.rebuild(catBar.catIconsMeaning[catBar.selectedIcon])
+
+        itemListPlayer.isCompactMode = yes
+        itemListPlayer.gridModeButtons[0].highlighted = !yes
+        itemListPlayer.gridModeButtons[1].highlighted = yes
+        itemListPlayer.itemPage = 0
+        itemListPlayer.rebuild(catBar.catIconsMeaning[catBar.selectedIcon])
+    }
+
     override fun updateUI(delta: Float) {
         if (!initialised) {
             initialised = true
@@ -143,6 +157,12 @@ internal class UIStorageChest : UICanvas(), HasInventory {
 
             handler.allowESCtoClose = true
 
+            // make grid mode buttons work together
+            itemListChest.gridModeButtons[0].touchDownListener = { _,_,_,_ -> setCompact(false) }
+            itemListChest.gridModeButtons[1].touchDownListener = { _,_,_,_ -> setCompact(true) }
+            itemListPlayer.gridModeButtons[0].touchDownListener = { _,_,_,_ -> setCompact(false) }
+            itemListPlayer.gridModeButtons[1].touchDownListener = { _,_,_,_ -> setCompact(true) }
+
             addUIitem(catBar)
             addUIitem(itemListChest)
             addUIitem(itemListPlayer)
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt
index 2eb2a001a..68fa464aa 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt
@@ -233,7 +233,7 @@ class UIItemInventoryItemGrid(
             posY - 2 + (4 + UIItemInventoryElem.height - catBar.catIcons.tileH) * index
 
     /** Long/compact mode buttons */
-    private val gridModeButtons = Array<UIItemImageButton>(2) { index ->
+    internal val gridModeButtons = Array<UIItemImageButton>(2) { index ->
         UIItemImageButton(
                 parentUI,
                 catBar.catIcons.get(index + 14, 0),