diff --git a/polymer/eduke32/build/include/editor.h b/polymer/eduke32/build/include/editor.h
index 35a0352f2..03dbd00e9 100644
--- a/polymer/eduke32/build/include/editor.h
+++ b/polymer/eduke32/build/include/editor.h
@@ -105,6 +105,8 @@ extern const char *mapster32_fullpath;
 extern char *testplay_addparam;
 extern const char *g_namesFileName;
 
+extern int32_t gridlock;
+
 extern int32_t g_maxCacheSize;
 
 extern int32_t g_lazy_tileselector;
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index b761ef69f..0048f6087 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -4474,6 +4474,12 @@ static void Keys3d(void)
         message("Visibility changed on all selected sectors");
     }
 
+    if (PRESSED_KEYSC(L))  // L (grid lock)
+    {
+        gridlock = !gridlock;
+        message("Grid locking %s", gridlock ? "on" : "off");
+    }
+
     if (PRESSED_KEYSC(V))  //V
     {
         if (ASSERT_AIMING)