diff --git a/src/components/popover/tab/keymap/keymap-tab.component.html b/src/components/popover/tab/keymap/keymap-tab.component.html
index 14df4822..8dd1adc7 100644
--- a/src/components/popover/tab/keymap/keymap-tab.component.html
+++ b/src/components/popover/tab/keymap/keymap-tab.component.html
@@ -2,13 +2,13 @@
     <b>Switch to keymap:</b>
     <select2
             [data]="keymapOptions"
-            [value]="selectedKeymap?.abbreviation"
+            [value]="selectedKeymap?.abbreviation || -1"
             (valueChanged)="onChange($event)"
             [width]="'100%'"
     ></select2>
 </div>
 <div>
-    <div *ngIf="!selectedKeymap?.abbreviation">
+    <div class="empty" *ngIf="!selectedKeymap?.abbreviation">
         <img src="./images/base-layer--blank.svg">
     </div>
     <svg-keyboard *ngIf="selectedKeymap?.abbreviation"
diff --git a/src/components/popover/tab/keymap/keymap-tab.component.scss b/src/components/popover/tab/keymap/keymap-tab.component.scss
index 21797010..b1efee02 100644
--- a/src/components/popover/tab/keymap/keymap-tab.component.scss
+++ b/src/components/popover/tab/keymap/keymap-tab.component.scss
@@ -26,3 +26,14 @@
         }
     }
 }
+
+.empty {
+    display: flex;
+
+    img {
+        display: flex;
+        width: 100%;
+        height: 100%;
+        position: relative;
+    }
+}
diff --git a/src/components/popover/tab/keymap/keymap-tab.component.ts b/src/components/popover/tab/keymap/keymap-tab.component.ts
index dc69c4f6..d9e473df 100644
--- a/src/components/popover/tab/keymap/keymap-tab.component.ts
+++ b/src/components/popover/tab/keymap/keymap-tab.component.ts
@@ -24,11 +24,6 @@ export class KeymapTabComponent implements OnInit, Tab {
     }
 
     ngOnInit() {
-        this.keymapOptions.push({
-            id: '-1',
-            text: 'Switch to keymap'
-        });
-
         this.keymapOptions = this.keymaps.map((keymap: Keymap): Select2OptionData => {
             return {
                 id: keymap.abbreviation,
@@ -36,6 +31,14 @@ export class KeymapTabComponent implements OnInit, Tab {
             };
         });
 
+        this.keymapOptions = [
+            {
+                id: '-1',
+                text: 'Switch to keymap'
+            },
+            ...this.keymapOptions
+        ];
+
         this.fromKeyAction(this.defaultKeyAction);
     }
 
@@ -56,6 +59,7 @@ export class KeymapTabComponent implements OnInit, Tab {
         if (!(keyAction instanceof SwitchKeymapAction)) {
             return false;
         }
+
         let switchKeymapAction: SwitchKeymapAction = <SwitchKeymapAction>keyAction;
         this.selectedKeymap = this.keymaps
             .find((keymap: Keymap) => keymap.abbreviation === switchKeymapAction.keymapAbbreviation);