diff --git a/src/framewin.c b/src/framewin.c
index b11f414e..e72d881d 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -1394,7 +1394,7 @@ static void handleButtonExpose(WObjDescriptor * desc, XEvent * event)
 
 #ifdef XKB_BUTTON_HINT
 	if (button == fwin->language_button) {
-		if (wPreferences.modelock)
+		if (!fwin->flags.hide_language_button)
 			paintButton(button, fwin->title_texture[fwin->flags.state],
 				    WMColorPixel(fwin->title_color[fwin->flags.state]),
 				    fwin->languagebutton_image, False);
diff --git a/src/window.c b/src/window.c
index 8a14a034..80b38430 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1437,7 +1437,8 @@ WWindow *wManageInternalWindow(WScreen *scr, Window window, Window owner,
 	foo = WFF_RIGHT_BUTTON | WFF_BORDER;
 	foo |= WFF_TITLEBAR;
 #ifdef XKB_BUTTON_HINT
-	foo |= WFF_LANGUAGE_BUTTON;
+	if (wPreferences.modelock)
+		foo |= WFF_LANGUAGE_BUTTON;
 #endif
 
 	wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel,