diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index d1f40a8b64..10c6accdcc 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -203,7 +203,14 @@ layers_text_tool_cmd_callback (GtkAction *action,
     }
 
   if (GIMP_IS_TEXT_TOOL (active_tool))
-    gimp_text_tool_set_layer (GIMP_TEXT_TOOL (active_tool), layer);
+    {
+      GimpDisplayShell *shell;
+
+      gimp_text_tool_set_layer (GIMP_TEXT_TOOL (active_tool), layer);
+
+      shell = gimp_display_get_shell (active_tool->display);
+      gtk_widget_grab_focus (shell->canvas);
+    }
 }
 
 void