diff --git a/src/main/java/com/wurmonline/server/questions/ShopQuestion.java b/src/main/java/com/wurmonline/server/questions/ShopQuestion.java
index dad518b..c74ef17 100644
--- a/src/main/java/com/wurmonline/server/questions/ShopQuestion.java
+++ b/src/main/java/com/wurmonline/server/questions/ShopQuestion.java
@@ -126,15 +126,15 @@ public class ShopQuestion extends Question {
             form.endHorizontalFlow();
         }
 
-        // Items list (one row per item)
+        // Items table
+        form.beginTable(items.size(), new String[] { "Item", "Description", "Price", "Buy" });
         for (ShopItem item : items) {
-            form.beginHorizontalFlow();
             form.addLabel(escape(item.getName()));
             form.addLabel(escape(item.getDescription()));
             form.addLabel(escape(item.getPriceDisplay()));
             form.addButton("+1", "buy_" + item.getId());
-            form.endHorizontalFlow();
         }
+        form.endTable();
 
         form.beginHorizontalFlow();
         form.addButton("Close", "close");