diff --git a/src/components/ControllerBottom.vue b/src/components/ControllerBottom.vue
index b3e053e51b..b45fbb8590 100644
--- a/src/components/ControllerBottom.vue
+++ b/src/components/ControllerBottom.vue
@@ -250,8 +250,10 @@ export default {
               stats.count
             } keycodes. Defined ${stats.any} Any key keycodes\n`;
             store.commit('status/deferredMessage', msg);
-            store.commit('app/setKeymapName', data.keymap);
-            store.commit('keymap/setDirty');
+            store.dispatch('status/viewReadme', this.keyboard).then(() => {
+              store.commit('app/setKeymapName', data.keymap);
+              store.commit('keymap/setDirty');
+            });
           });
           disableOtherButtons();
         });
diff --git a/src/components/VisualKeymap.vue b/src/components/VisualKeymap.vue
index 959e9179b5..a6a42d5c1a 100644
--- a/src/components/VisualKeymap.vue
+++ b/src/components/VisualKeymap.vue
@@ -65,8 +65,9 @@ export default {
         return [];
       }
       if (this.loadingKeymapPromise) {
-        this.loadingKeymapPromise();
+        const _promise = this.loadingKeymapPromise;
         this.setLoadingKeymapPromise(undefined);
+        _promise();
       }
       // Calculate Max with given layout
       // eslint-disable-next-line no-console
diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index d26725a639..50b320a73e 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -22,6 +22,7 @@ const actions = {
       .get(backend_readme_url_template({ keyboard: _keyboard }))
       .then(result => {
         if (result.status === 200) {
+          commit('clear');
           commit('append', escape(result.data));
           commit('append', escape(state.deferredMessage));
           commit('deferredMessage', '');