diff --git a/src/store/modules/app/getters.js b/src/store/modules/app/getters.js
index b829fcb46c..fd0371663c 100644
--- a/src/store/modules/app/getters.js
+++ b/src/store/modules/app/getters.js
@@ -10,9 +10,11 @@ const getters = {
   filter: (state) => state.filter,
   exportKeymapName: (state) => {
     let exportName = state.keymapName.replace(/[\s/]/g, '_').toLowerCase();
+    let keyboardName = state.keyboard.replace(/[\s/]/g, '_').toLowerCase();
     if (exportName === '') {
-      let keyboardName = state.keyboard.replace(/[\s/]/g, '_').toLowerCase();
       exportName = `${keyboardName}_${state.layout}_mine`.toLowerCase();
+    } else {
+      exportName = `${keyboardName}_${exportName}`.toLowerCase();
     }
     // issue #331 whitelist what we send to API for keymapName and save to disk
     exportName = exportName.replace(/[^a-z0-9_-]/gi, '');