diff --git a/browser/main/global.styl b/browser/main/global.styl
index 428c6e00..9cf104b4 100644
--- a/browser/main/global.styl
+++ b/browser/main/global.styl
@@ -133,8 +133,8 @@ body[data-theme="dark"]
   content: "\25B8"
 
 .CodeMirror-hover
+  padding 2px 4px 0 4px
   position absolute
-  border-bottom 1px solid white
   z-index 99
 
 .CodeMirror-hyperlink
diff --git a/browser/codemirror/addon/hyperlink/hyperlink.js b/extra_scripts/codemirror/addon/hyperlink/hyperlink.js
similarity index 84%
rename from browser/codemirror/addon/hyperlink/hyperlink.js
rename to extra_scripts/codemirror/addon/hyperlink/hyperlink.js
index 87c6a85e..a7756400 100755
--- a/browser/codemirror/addon/hyperlink/hyperlink.js
+++ b/extra_scripts/codemirror/addon/hyperlink/hyperlink.js
@@ -26,7 +26,7 @@
       this.tooltip = document.createElement('div')
       this.tooltipContent = document.createElement('div')
       this.tooltipIndicator = document.createElement('div')
-      this.tooltip.setAttribute('class', 'CodeMirror-hover')
+      this.tooltip.setAttribute('class', 'CodeMirror-hover CodeMirror-matchingbracket CodeMirror-selected')
       this.tooltip.setAttribute('cm-ignore-events', 'true')
       this.tooltip.appendChild(this.tooltipContent)
       this.tooltip.appendChild(this.tooltipIndicator)
@@ -67,7 +67,10 @@
       const url = this.getUrl(target)
       if (url) {
         if (metaKey) {
-          target.classList.add('CodeMirror-hyperlink')
+          target.classList.add('CodeMirror-activeline-background', 'CodeMirror-hyperlink')
+        }
+        else {
+          target.classList.add('CodeMirror-activeline-background')
         }
 
         this.showInfo(target)
@@ -75,7 +78,7 @@
     }
     onMouseLeave(e) {
       if (this.tooltip.parentElement === this.lineDiv) {
-        e.target.classList.remove('CodeMirror-hyperlink')
+        e.target.classList.remove('CodeMirror-activeline-background', 'CodeMirror-hyperlink')
 
         this.lineDiv.removeChild(this.tooltip)
       }
@@ -104,7 +107,13 @@
         xOffset = b3.right - b2.right
         tdiv.style.left = (b1.left - b2.left - xOffset) + 'px'
       }
-      tdiv.style.top = (b1.top - b2.top - b3.height - this.yOffset) + 'px'
+      const top = b1.top - b2.top - b3.height - this.yOffset
+      if (top < 0) {
+        tdiv.style.top = (b1.top - b2.top + b1.height + this.yOffset) + 'px'
+      }
+      else {
+        tdiv.style.top = top + 'px'
+      }
 
       this.tooltipIndicator.style.marginLeft = xOffset + 'px'
     }
diff --git a/lib/main.html b/lib/main.html
index c8d89464..9ab1838b 100644
--- a/lib/main.html
+++ b/lib/main.html
@@ -96,7 +96,7 @@
   <script src="../node_modules/codemirror/addon/runmode/runmode.js"></script>
 
   <script src="../extra_scripts/boost/boostNewLineIndentContinueMarkdownList.js"></script>
-  <script src="../browser/codemirror/addon/hyperlink/hyperlink.js"></script>
+  <script src="../extra_scripts/codemirror/addon/hyperlink/hyperlink.js"></script>
 
   <script src="../node_modules/codemirror/addon/edit/closebrackets.js"></script>
   <script src="../node_modules/codemirror/addon/edit/matchbrackets.js"></script>