diff --git a/src/m_menu.c b/src/m_menu.c
index e77a5001..c5484d24 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2344,7 +2344,7 @@ void M_DrawSetting(setup_menu_t* s)
 
   // Is the item a paint chip?
 
-  if (flags & S_COLOR) // Automap paint chip
+  if (flags & S_AM_COLOR) // Automap paint chip
     {
       int i, ch;
       byte *ptr = colorblock;
diff --git a/src/m_menu.h b/src/m_menu.h
index 81bd4e3c..582aa0fa 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -134,7 +134,7 @@ extern int warning_about_changes, print_warning_about_changes;
 
 #define S_SHOWSET  (S_YESNO|S_CRITEM|S_COLOR|S_CHAT|S_INPUT|S_WEAP|S_NUM|S_CHOICE|S_THERMO|S_NAME)
 
-#define S_STRING (S_CHAT|S_NAME)
+#define S_STRING (S_CHAT_MACRO|S_NAME)
 
 #define S_HASDEFPTR (S_STRING|S_YESNO|S_NUM|S_WEAP|S_COLOR|S_CRITEM|S_CHOICE|S_THERMO)