diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 7dec3f1f..d54a46c6 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -218,6 +218,9 @@
 #undef DEFINABLE_CURSOR
 
 
+#undef NO_WINDOW_ENUMERATOR
+
+
 /*
  *--------------------------------------------------------------------
  * 			Default Configuration
@@ -580,12 +583,13 @@
 #ifdef XKB_MODELOCK
 #define KEEP_XKB_LOCK_STATUS
 /* This is a hidden feature.
- * choose one between 2 of these hints. Icon can be changed
- * in def_pixmaps.h and default icon is now for Thai language only.
+ * Choose just one of LANGUAGE_* hints.
+ * Icon can be changed in def_pixmaps.h.
  * More icons are welcome.
  */
 #define XKB_BUTTON_HINT
 #undef LANGUAGE_TH
+#undef LANGUAGE_SK
 #endif
 
 #ifndef DEMATERIALIZE_ICON
diff --git a/src/window.c b/src/window.c
index e3019c65..12b69ffc 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1790,11 +1790,13 @@ wWindowUpdateName(WWindow *wwin, char *newTitle)
 	title = newTitle;
     }
     
+#ifdef NO_WINDOW_ENUMERATOR
     if (instIndex > 0) {
 	sprintf(prefix, "  [%i]", instIndex);
 	
 	title = wstrconcat(title, prefix);
     }
+#endif
     
     if (wFrameWindowChangeTitle(wwin->frame, title)) {
 	/* only update the menu if the title has actually changed */