diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index 80680033f7..3a52a9ec91 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -338,7 +338,6 @@ profiler2.gpu.intel.enable = true           ; Allow GL_INTEL_performance_queries
 ; Developer options
 jsdebugger.enable = false                   ; Enable Javascript debugging. The Debugger is currently broken and can't be enabled until the SpiderMonkey upgrade is done and the debugger is updated for the new API.
 tinygettext.debug = false                   ; Enable Tinygettext debugging information. If true, Tinygettext prints error messages each time that a translation for an English string is not found.
-developeroverlay.enable = false             ; Enable in-game Developer Overlay.
 
 ; > QUICKSAVE
 hotkey.quicksave = "Shift+F5"
diff --git a/binaries/data/mods/public/gui/options/options.js b/binaries/data/mods/public/gui/options/options.js
index 93e2836d8f..fea8357ef7 100644
--- a/binaries/data/mods/public/gui/options/options.js
+++ b/binaries/data/mods/public/gui/options/options.js
@@ -10,7 +10,6 @@ var options = {
 		[translate("Background Pause"), translate("Pause single player games when window loses focus"), {"config":"pauseonfocusloss"}, "boolean"],
 		[translate("Disable Welcome Screen"), translate("If you disable this screen completely, you may miss important announcements.\nYou can still launch it using the main menu."), {"config":"splashscreendisable"}, "boolean"],
 		[translate("Detailed Tooltips"), translate("Show detailed tooltips for trainable units in unit-producing buildings."), {"config":"showdetailedtooltips"}, "boolean"],
-		[translate("Developer Overlay"), translate("Show overlay in-game with options such as reveal map, control all units, and change perspective. Designed for use by developers"), {"config":"developeroverlay.enable"}, "boolean"],
 	],
 	"graphicsSetting":
 	[
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 28636d43f5..b17e9e5d72 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -506,7 +506,7 @@
 				<object type="button"
 					style="StoneButton"
 					tooltip_style="pgToolTip"
-					size="8 100%-108 100%-8 100% -80"
+					size="8 100%-108 100%-8 100%-80"
 				>
 					<translatableAttribute id="caption">Help with the Translation!</translatableAttribute>
 					<translatableAttribute id="tooltip">Click to open the 0 A.D translate page in your browser.</translatableAttribute>
diff --git a/binaries/data/mods/public/gui/session/menu.js b/binaries/data/mods/public/gui/session/menu.js
index 8bfba9acd2..afa08b61d8 100644
--- a/binaries/data/mods/public/gui/session/menu.js
+++ b/binaries/data/mods/public/gui/session/menu.js
@@ -666,6 +666,7 @@ function openManual()
 
 function toggleDeveloperOverlay()
 {
+	// The developer overlay is disabled in ranked games
 	if (Engine.HasXmppClient() && Engine.IsRankedGame())
 		return;
 
@@ -674,10 +675,8 @@ function toggleDeveloperOverlay()
 		submitChatDirectly(translate("The Developer Overlay was opened."));
 	else
 		submitChatDirectly(translate("The Developer Overlay was closed."));
-	// Update the options dialog
+	// Toggle the overlay
 	devCommands.hidden = !devCommands.hidden;
-	// Save the changes
-	Engine.ConfigDB_CreateValue("user", "developeroverlay.enable", String(!devCommands.hidden) );
 }
 
 function closeOpenDialogs()
diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index ac3a888b52..1237c80a19 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -242,10 +242,6 @@
 	<object name="devCommands" size="100%-225 50%-88 100%-8 50%+104" type="image" sprite="devCommandsBackground" z="40"
 		hidden="true" hotkey="session.devcommands.toggle">
 		<action on="Press">toggleDeveloperOverlay();</action>
-		<action on="Tick">
-			if (this.hidden != (Engine.ConfigDB_GetValue("user", "developeroverlay.enable") === "false"))
-				toggleDeveloperOverlay();
-		</action>
 
 		<object size="0 0 100%-18 16" type="text" style="devCommandsText">
 			<translatableAttribute id="caption">Control all units</translatableAttribute>