diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index a0f991d83..e4068fcca 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,6 @@
 June 26, 2008
+- For controls that are not bound, the customize controls menu now displays
+  a black --- instead of ???.
 - Applied Gez's BossBrainPatch3.
 - Fixed: P_BulletSlope() did not return the linetarget. This effected
   the Sigil, A_JumpIfCloser, and A_JumpIfTargetInLOS.
diff --git a/src/c_bind.cpp b/src/c_bind.cpp
index 76be223cd..e7fb28388 100644
--- a/src/c_bind.cpp
+++ b/src/c_bind.cpp
@@ -681,7 +681,7 @@ void C_NameKeys (char *str, int first, int second)
 	}
 
 	if (!c)
-		strcpy (str, "???");
+		*str = '\0';
 }
 
 void C_UnbindACommand (char *str)
diff --git a/src/m_options.cpp b/src/m_options.cpp
index 2bb774f6c..a914eb233 100644
--- a/src/m_options.cpp
+++ b/src/m_options.cpp
@@ -1896,7 +1896,15 @@ void M_OptDrawer ()
 				char description[64];
 
 				C_NameKeys (description, item->b.key1, item->c.key2);
-				M_DrawConText(CR_WHITE, CurrentMenu->indent + 14, y-1+labelofs, description);
+				if (description[0])
+				{
+					M_DrawConText(CR_WHITE, CurrentMenu->indent + 14, y-1+labelofs, description);
+				}
+				else
+				{
+					screen->DrawText(CR_BLACK, CurrentMenu->indent + 14, y + labelofs, "---",
+						DTA_Clean, true, TAG_DONE);
+				}
 			}
 			break;