diff --git a/src/config/parse_config.h b/src/config/parse_config.h
index 99b2d903..47dc343a 100644
--- a/src/config/parse_config.h
+++ b/src/config/parse_config.h
@@ -1051,6 +1051,7 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
 		(*arg).v = strdup(arg_value);
 	} else if (strcmp(func_name, "switch_keyboard_layout") == 0) {
 		func = switch_keyboard_layout;
+		(*arg).i = CLAMP_INT(atoi(arg_value), 0, 100);
 	} else if (strcmp(func_name, "setlayout") == 0) {
 		func = setlayout;
 		(*arg).v = strdup(arg_value);
diff --git a/src/dispatch/bind_define.h b/src/dispatch/bind_define.h
index 879a4c72..61d6e565 100644
--- a/src/dispatch/bind_define.h
+++ b/src/dispatch/bind_define.h
@@ -915,7 +915,13 @@ int32_t switch_keyboard_layout(const Arg *arg) {
 		wlr_log(WLR_INFO, "Only one layout available");
 		return 0;
 	}
-	xkb_layout_index_t next = (current + 1) % num_layouts;
+
+	xkb_layout_index_t next = 0;
+	if (arg->i > 0 && arg->i <= num_layouts) {
+		next = arg->i - 1;
+	} else {
+		next = (current + 1) % num_layouts;
+	}
 
 	// 6. Apply new keymap
 	uint32_t depressed = keyboard->modifiers.depressed;
diff --git a/src/layout/horizontal.h b/src/layout/horizontal.h
index 48d7e8aa..4dedf872 100644
--- a/src/layout/horizontal.h
+++ b/src/layout/horizontal.h
@@ -374,6 +374,7 @@ void scroller(Monitor *m) {
 
 	bool need_apply_overspread =
 		scroller_prefer_overspread && m->visible_scroll_tiling_clients > 1 &&
+		(focus_client_index == 0 || focus_client_index == n - 1) &&
 		tempClients[focus_client_index]->scroller_proportion < 1.0f;
 
 	if (need_apply_overspread) {
diff --git a/src/layout/vertical.h b/src/layout/vertical.h
index e70af206..cea65798 100644
--- a/src/layout/vertical.h
+++ b/src/layout/vertical.h
@@ -358,6 +358,7 @@ void vertical_scroller(Monitor *m) {
 
 	bool need_apply_overspread =
 		scroller_prefer_overspread && m->visible_scroll_tiling_clients > 1 &&
+		(focus_client_index == 0 || focus_client_index == n - 1) &&
 		tempClients[focus_client_index]->scroller_proportion < 1.0f;
 
 	if (need_apply_overspread) {