diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 20149bee..995be07c 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -285,6 +285,7 @@ this is for compatibility with Openbox.
 		--button-text-color '%t' \\
 		--border-bottom-size 1 \\
 		--button-border-size 3 \\
+		--keyboard-focus on-demand \\
 		--timeout 0
 	```
 
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index be49eaeb..6d0caf80 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -1645,6 +1645,7 @@ post_processing(void)
 				"--button-text-color '%t' "
 				"--border-bottom-size 1 "
 				"--button-border-size 3 "
+				"--keyboard-focus on-demand "
 				"--timeout 0");
 	}
 	if (!rc.fallback_app_icon_name) {