diff --git a/src/components/svg/module/svg-module.component.html b/src/components/svg/module/svg-module.component.html
index 793b7b27..1d61ad92 100644
--- a/src/components/svg/module/svg-module.component.html
+++ b/src/components/svg/module/svg-module.component.html
@@ -6,6 +6,6 @@
         [attr.transform]="'translate(' + key.x + ' ' + key.y + ')'"
         [keyAction]="keyActions[i]"
         (click)="onKeyClick(i)"
-        (mouseover)="onKeyHover(i, $event, true)"
+        (mouseenter)="onKeyHover(i, $event, true)"
         (mouseleave)="onKeyHover(i, $event, false)"
 />
\ No newline at end of file
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.html b/src/components/svg/wrap/svg-keyboard-wrap.component.html
index e625c0b7..686f9b9c 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.html
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.html
@@ -1,6 +1,6 @@
 <template ngIf="layers">
     <layers [class.disabled]="popoverShown" (select)="selectLayer($event.oldIndex, $event.index)" [current]="currentLayer"></layers>
-    <div class="keyboard-slider" (mouseout)="hideTooltip($event)">
+    <div class="keyboard-slider">
         <svg-keyboard *ngFor="let layer of layers; trackBy: trackKeyboard"
                       [@layerState]="layer.animation"
                       [moduleConfig]="layer.modules"
@@ -10,8 +10,8 @@
         </svg-keyboard>
     </div>
     <popover *ngIf="popoverShown" [defaultKeyAction]="popoverInitKeyAction" [currentKeymap]="keymap" (cancel)="hidePopover()" (remap)="onRemap($event)"></popover>
-    <div class="tooltip top fade" role="tooltip"
-         [class.in]="tooltipData.shown"
+    <div class="tooltip bottom"
+         [class.in]="tooltipData.show"
          [style.top.px]="tooltipData.posTop"
          [style.left.px]="tooltipData.posLeft"
     >
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.scss b/src/components/svg/wrap/svg-keyboard-wrap.component.scss
index 34569d4f..697d0aee 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.scss
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.scss
@@ -22,7 +22,8 @@ svg-keyboard {
 }
 .tooltip {
     position: fixed;
-    transform: translate(-50%, -85%);
+    transform: translate(-50%, -6px);
+    display: none;
 
     &-inner {
         background: #fff;
@@ -39,13 +40,15 @@ svg-keyboard {
         }
     }
 
-    &.top {
+    &.bottom {
         .tooltip-arrow {
-            border-top-color: #fff;
+            border-bottom-color: #fff;
+            top: 1px;
         }
     }
 
     &.in {
+        display: block;
         opacity: 1;
     }
 }
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.ts b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
index ffe55d4a..321fa5a4 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.ts
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
@@ -97,7 +97,7 @@ export class SvgKeyboardWrapComponent implements OnChanges {
     private keyEditConfig: { moduleId: number, keyId: number };
     private popoverInitKeyAction: KeyAction;
     private currentLayer: number = 0;
-    private tooltipData: { posTop: number, posLeft: number, content: { name: string, value: string }[], shown: boolean };
+    private tooltipData: { posTop: number, posLeft: number, content: { name: string, value: string }[], show: boolean };
     private layers: Layer[];
 
     constructor(private store: Store<AppState>, private mapper: MapperService) {
@@ -110,7 +110,7 @@ export class SvgKeyboardWrapComponent implements OnChanges {
             posTop: 0,
             posLeft: 0,
             content: [],
-            shown: false
+            show: false
         };
     }
 
@@ -142,13 +142,13 @@ export class SvgKeyboardWrapComponent implements OnChanges {
     }
 
     onKeyHover(moduleId: number, event: MouseEvent, over: boolean, keyId: number): void {
-        let keyActionToEdit: KeyAction = this.layers[this.currentLayer].modules[moduleId].keyActions[keyId];
-
         if (this.tooltipEnabled) {
+            const keyActionToEdit: KeyAction = this.layers[this.currentLayer].modules[moduleId].keyActions[keyId];
+
             if (over) {
                 this.showTooltip(keyActionToEdit, event);
             } else {
-                this.hideTooltip(event);
+                this.hideTooltip();
             }
         }
     }
@@ -171,19 +171,18 @@ export class SvgKeyboardWrapComponent implements OnChanges {
     }
 
     showTooltip(keyAction: KeyAction, event: MouseEvent): void {
-
         if (keyAction === undefined) {
             return;
         }
 
-        let el: Element = event.target as Element || event.srcElement;
-        let position: ClientRect = el.getBoundingClientRect();
+        const el: Element = event.target as Element || event.srcElement;
+        const position: ClientRect = el.getBoundingClientRect();
         let posLeft: number = this.tooltipData.posLeft;
         let posTop: number = this.tooltipData.posTop;
 
-        if (el.tagName === 'rect') {
+        if (el.tagName === 'g') {
             posLeft = position.left + (position.width / 2);
-            posTop = position.top;
+            posTop = position.top + position.height;
         }
 
         let content: {
@@ -294,22 +293,12 @@ export class SvgKeyboardWrapComponent implements OnChanges {
             posLeft: posLeft,
             posTop: posTop,
             content,
-            shown: true
+            show: true
         };
     }
 
-    hideTooltip(event: MouseEvent) {
-        let target: HTMLElement = event.relatedTarget as HTMLElement;
-        if (!target) {
-            this.tooltipData.shown = false;
-            return;
-        }
-
-        // Check if we are hovering tooltip
-        let list: DOMTokenList = target.classList;
-        if (!list.contains('tooltip') && !list.contains('tooltip-inner')) {
-            this.tooltipData.shown = false;
-        }
+    hideTooltip() {
+        this.tooltipData.show = false;
     }
 
     hidePopover(): void {