diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp
index 980779261..3a73060f5 100644
--- a/src/game/editor/editor.cpp
+++ b/src/game/editor/editor.cpp
@@ -5939,13 +5939,14 @@ void CEditor::Render()
 		if(Zoom != 0)
 		{
 			float OldLevel = m_ZoomLevel;
-			m_ZoomLevel = clamp(m_ZoomLevel + Zoom * 20, 10, 2000);
+			m_ZoomLevel = maximum(m_ZoomLevel + Zoom * 20, 10);
+			if(g_Config.m_ClLimitMaxZoomLevel)
+				m_ZoomLevel = minimum(m_ZoomLevel, 2000);
 			if(g_Config.m_EdZoomTarget)
 				ZoomMouseTarget((float)m_ZoomLevel / OldLevel);
 		}
 	}
 
-	m_ZoomLevel = clamp(m_ZoomLevel, 10, 2000);
 	m_WorldZoom = m_ZoomLevel / 100.0f;
 
 	if(m_GuiActive)