diff --git a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java
index 46b7cd34..93a19764 100644
--- a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java
+++ b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java
@@ -127,6 +127,7 @@ public class Catalog {
 					if (currentScenarioView != null) {
 						currentScenarioView = null;
 						ui.setRoot(app, true);
+						ui.setFocus(categories);
 					}
 					else {
 						requestQuit();