diff --git a/src/app/Coriolis.jsx b/src/app/Coriolis.jsx
index 7334ac2e..e3318368 100644
--- a/src/app/Coriolis.jsx
+++ b/src/app/Coriolis.jsx
@@ -269,7 +269,7 @@ export default class Coriolis extends React.Component {
 
     window.onerror = this._onError.bind(this);
     window.addEventListener('resize', () => this.emitter.emit('windowResize'));
-    document.body.addEventListener('scroll', () => this._tooltip());
+    document.getElementById('coriolis').addEventListener('scroll', () => this._tooltip());
     document.addEventListener('keydown', this._keyDown);
     Persist.addListener('language', this._onLanguageChange);
     Persist.addListener('sizeRatio', this._onSizeRatioChange);
diff --git a/src/less/table.less b/src/less/table.less
index 17c5967d..8ce9c326 100755
--- a/src/less/table.less
+++ b/src/less/table.less
@@ -47,7 +47,7 @@ tbody tr {
     text-align: right;
   }
 
-  .no-touch &.highlight:hover {
+  .no-touch &.highlight:hover, .no-touch &.highlighted {
     background-color: @warning-bg;
   }
 }