1 files changed, 4 insertions, 1 deletions

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index f6338c55..97ffe91c 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -193,7 +193,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
                         "Expected 'focus output <direction|name>'");
         }
         char *identifier = join_args(argv, argc);
-        struct sway_output *output = output_by_name(identifier);
+        struct sway_output *output = output_by_name_or_id(identifier);
 
         if (!output) {
                 enum wlr_direction direction;
@@ -269,6 +269,9 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
         }
 
         if (argc == 0 && container) {
+                if (container->scratchpad && !container->workspace) {
+                        root_scratchpad_show(container);
+                }
                 seat_set_focus_container(seat, container);
                 seat_consider_warp_to_focus(seat);
                 return cmd_results_new(CMD_SUCCESS, NULL, NULL);