diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index 65a5d5a99..db0fd2efb 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -65,7 +65,7 @@
 CVAR (Float, mouse_sensitivity, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR (Bool, show_messages, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR (Bool, show_obituaries, true, CVAR_ARCHIVE)
-CVAR(Bool, m_showinputgrid, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
+CVAR (Int, m_showinputgrid, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, m_blockcontrollers, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
 
diff --git a/wadsrc/static/zscript/menu/textentermenu.txt b/wadsrc/static/zscript/menu/textentermenu.txt
index 69a6694f3..db38896b3 100644
--- a/wadsrc/static/zscript/menu/textentermenu.txt
+++ b/wadsrc/static/zscript/menu/textentermenu.txt
@@ -63,7 +63,7 @@ class TextEnterMenu : Menu
 		mEnterString = textbuffer;
 		mEnterSize = maxlen < 0 ? 0x7fffffff : maxlen;
 		mSizeMode = sizemode;
-		mInputGridOkay = showgrid || m_showinputgrid;
+		mInputGridOkay = (showgrid && (m_showinputgrid == 0)) || (m_showinputgrid >= 1);
 		if (mEnterString.Length() > 0)
 		{
 			InputGridX = INPUTGRID_WIDTH - 1;