diff --git a/src/components/keyboard/slider/keyboard-slider.component.html b/src/components/keyboard/slider/keyboard-slider.component.html
index 0d1812ac..bd0dd323 100644
--- a/src/components/keyboard/slider/keyboard-slider.component.html
+++ b/src/components/keyboard/slider/keyboard-slider.component.html
@@ -1,6 +1,7 @@
 <svg-keyboard *ngFor="let layer of layers; let index = index; trackBy: trackKeyboard"
                       [@layerState]="layerAnimationState[index]"
                       [moduleConfig]="layer.modules"
+                      [keybindAnimationEnabled]="keybindAnimationEnabled"
                       (keyClick)="keyClick.emit($event)"
                       (keyHover)="keyHover.emit($event)">
 </svg-keyboard>
\ No newline at end of file
diff --git a/src/components/keyboard/slider/keyboard-slider.component.ts b/src/components/keyboard/slider/keyboard-slider.component.ts
index f676e2e4..72fb8c75 100644
--- a/src/components/keyboard/slider/keyboard-slider.component.ts
+++ b/src/components/keyboard/slider/keyboard-slider.component.ts
@@ -78,6 +78,7 @@ type AnimationKeyboard =
 export class KeyboardSliderComponent implements OnChanges {
     @Input() layers: Layer[];
     @Input() currentLayer: number;
+    @Input() keybindAnimationEnabled: boolean;
     @Output() keyClick = new EventEmitter();
     @Output() keyHover = new EventEmitter();
 
diff --git a/src/components/svg/keyboard/svg-keyboard.component.html b/src/components/svg/keyboard/svg-keyboard.component.html
index 1b97ba19..15174c84 100644
--- a/src/components/svg/keyboard/svg-keyboard.component.html
+++ b/src/components/svg/keyboard/svg-keyboard.component.html
@@ -3,6 +3,7 @@
         <svg:g svg-module *ngFor="let module of modules; let i = index"
                 [coverages]="module.coverages"
                 [keyboardKeys]="module.keyboardKeys"
+                [keybindAnimationEnabled]="keybindAnimationEnabled"
                 [attr.transform]="module.attributes.transform"
                 [keyActions]="moduleConfig[i].keyActions"
                 (keyClick)="onKeyClick(i, $event.index, $event.keyTarget)"
diff --git a/src/components/svg/keyboard/svg-keyboard.component.ts b/src/components/svg/keyboard/svg-keyboard.component.ts
index 0f3c8ca2..ef998172 100644
--- a/src/components/svg/keyboard/svg-keyboard.component.ts
+++ b/src/components/svg/keyboard/svg-keyboard.component.ts
@@ -10,6 +10,7 @@ import { SvgModule } from '../module';
 })
 export class SvgKeyboardComponent implements OnInit {
     @Input() moduleConfig: Module[];
+    @Input() keybindAnimationEnabled: boolean;
     @Output() keyClick = new EventEmitter();
     @Output() keyHover = new EventEmitter();
 
diff --git a/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
index 2f1b652a..d1ee1552 100644
--- a/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
+++ b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
@@ -59,6 +59,7 @@ export class SvgKeyboardKeyComponent implements OnInit, OnChanges, OnDestroy {
     @Input() height: number;
     @Input() width: number;
     @Input() keyAction: KeyAction;
+    @Input() keybindAnimationEnabled: boolean;
     @Output() keyClick = new EventEmitter();
 
     enumLabelTypes = LabelTypes;
@@ -86,7 +87,9 @@ export class SvgKeyboardKeyComponent implements OnInit, OnChanges, OnDestroy {
         /* tslint:disable:no-string-literal */
         if (changes['keyAction']) {
             this.setLabels();
-            this.animation = 'active';
+            if (this.keybindAnimationEnabled) {
+                this.animation = 'active';
+            }
         }
         /* tslint:enable:no-string-literal */
     }
diff --git a/src/components/svg/module/svg-module.component.html b/src/components/svg/module/svg-module.component.html
index ebd314dd..41dd0506 100644
--- a/src/components/svg/module/svg-module.component.html
+++ b/src/components/svg/module/svg-module.component.html
@@ -5,6 +5,7 @@
         [width]="key.width" [height]="key.height"
         [attr.transform]="'translate(' + key.x + ' ' + key.y + ')'"
         [keyAction]="keyActions[i]"
+        [keybindAnimationEnabled]="keybindAnimationEnabled"
         (keyClick)="onKeyClick(i, $event)"
         (mouseenter)="onKeyHover(i, $event, true)"
         (mouseleave)="onKeyHover(i, $event, false)"
diff --git a/src/components/svg/module/svg-module.component.ts b/src/components/svg/module/svg-module.component.ts
index d376f163..035ea41f 100644
--- a/src/components/svg/module/svg-module.component.ts
+++ b/src/components/svg/module/svg-module.component.ts
@@ -13,6 +13,7 @@ export class SvgModuleComponent {
     @Input() coverages: any[];
     @Input() keyboardKeys: SvgKeyboardKey[];
     @Input() keyActions: KeyAction[];
+    @Input() keybindAnimationEnabled: boolean;
     @Output() keyClick = new EventEmitter();
     @Output() keyHover = new EventEmitter();
 
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.html b/src/components/svg/wrap/svg-keyboard-wrap.component.html
index e0c6ee51..07a3314f 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.html
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.html
@@ -2,6 +2,7 @@
     <layers [class.disabled]="popoverShown" (select)="selectLayer($event.index)" [current]="currentLayer"></layers>
     <keyboard-slider [layers]="layers"
                      [currentLayer]="currentLayer"
+                     [keybindAnimationEnabled]="keybindAnimationEnabled"
                      (keyClick)="onKeyClick($event.moduleId, $event.keyId, $event.keyTarget)"
                      (keyHover)="onKeyHover($event.moduleId, $event.event, $event.over, $event.keyId)"></keyboard-slider>
     <popover [visible]="popoverShown" [keyPosition]="keyPosition" [wrapPosition]="wrapPosition" [defaultKeyAction]="popoverInitKeyAction" [currentKeymap]="keymap" (cancel)="hidePopover()" (remap)="onRemap($event)"></popover>
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.ts b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
index b67af34c..3001849b 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.ts
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
@@ -46,6 +46,7 @@ export class SvgKeyboardWrapComponent implements OnInit, OnChanges {
     private popoverShown: boolean;
     private keyEditConfig: { moduleId: number, keyId: number };
     private popoverInitKeyAction: KeyAction;
+    private keybindAnimationEnabled: boolean;
     private currentLayer: number = 0;
     private tooltipData: { posTop: number, posLeft: number, content: { name: string, value: string }[], show: boolean };
     private layers: Layer[];
@@ -89,13 +90,18 @@ export class SvgKeyboardWrapComponent implements OnInit, OnChanges {
     }
 
     ngOnChanges(changes: SimpleChanges) {
-        if (changes['keymap'].previousValue.abbreviation !== changes['keymap'].currentValue.abbreviation) {
-            this.layers = this.keymap.layers;
-            this.currentLayer = 0;
-            this.popoverShown = false;
-        } else if (changes['keymap']) {
+        const keymapChanges = changes['keymap'];
+        if (keymapChanges) {
             this.popoverShown = false;
+            if (keymapChanges.previousValue.abbreviation !== keymapChanges.currentValue.abbreviation) {
+                this.layers = this.keymap.layers;
+                this.currentLayer = 0;
+                this.keybindAnimationEnabled = keymapChanges.isFirstChange();
+            } else {
+                this.keybindAnimationEnabled = true;
+            }
         }
+
     }
 
     onKeyClick(moduleId: number, keyId: number, keyTarget: HTMLElement): void {