diff --git a/client/src/views/settings/fields/dashboard-layout.js b/client/src/views/settings/fields/dashboard-layout.js
index 615b18c9cb..02702ba826 100644
--- a/client/src/views/settings/fields/dashboard-layout.js
+++ b/client/src/views/settings/fields/dashboard-layout.js
@@ -110,7 +110,12 @@ define('views/settings/fields/dashboard-layout', ['views/fields/base', 'lib!grid
             this.setupCurrentTabLayout();
 
             if (this.isRendered()) {
-                this.reRender();
+                this.reRender()
+                    .then(() => {
+                        this.$el
+                            .find(`[data-action="selectTab"][data-tab="${tab}"]`)
+                            .focus();
+                    })
             }
         },