diff --git a/forge-gui/src/main/java/forge/view/FNavigationBar.java b/forge-gui/src/main/java/forge/view/FNavigationBar.java
index 496d25190f2..7c16ec6d5c2 100644
--- a/forge-gui/src/main/java/forge/view/FNavigationBar.java
+++ b/forge-gui/src/main/java/forge/view/FNavigationBar.java
@@ -33,6 +33,7 @@ import forge.gui.toolbox.FDigitalClock;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.JLabelSkin;
 import forge.gui.toolbox.FSkin.SkinColor;
+import forge.properties.ForgePreferences.FPref;
 import forge.util.ReflectionUtil;
 
 @SuppressWarnings("serial")
@@ -89,7 +90,10 @@ public class FNavigationBar extends FTitleBarBase {
 
         addNavigationTab(FScreen.HOME_SCREEN);
         addNavigationTab(FScreen.DECK_EDITOR_CONSTRUCTED);
-        addNavigationTab(FScreen.WORKSHOP_SCREEN);
+        if (Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_MODE_ENABLED)) {
+            //TODO: Make Workshop available outside developer mode when custom cards supported
+            addNavigationTab(FScreen.WORKSHOP_SCREEN);
+        }
 
         super.addControls();