diff --git a/src/widgets/tracksliderpopup.cpp b/src/widgets/tracksliderpopup.cpp
index b546c374f..9424cca83 100644
--- a/src/widgets/tracksliderpopup.cpp
+++ b/src/widgets/tracksliderpopup.cpp
@@ -28,15 +28,9 @@ TrackSliderPopup::TrackSliderPopup(QWidget* parent)
     visibility_timer_(new QTimer(this))
 {
   setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint |
-                 Qt::WindowStaysOnTopHint);
+                 Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
   setAttribute(Qt::WA_NoSystemBackground);
   setAttribute(Qt::WA_TranslucentBackground);
-#ifndef Q_OS_DARWIN
-  // Paints the whole rect with a white background on Mac.
-  setAttribute(Qt::WA_OpaquePaintEvent);
-  // Creates flicker on Mac.
-  setAttribute(Qt::WA_TransparentForMouseEvents);
-#endif
   setMouseTracking(true);
 
   visibility_timer_->setSingleShot(true);
diff --git a/src/widgets/tracksliderslider.cpp b/src/widgets/tracksliderslider.cpp
index 62fdb07d1..ec9422f9c 100644
--- a/src/widgets/tracksliderslider.cpp
+++ b/src/widgets/tracksliderslider.cpp
@@ -82,7 +82,9 @@ void TrackSliderSlider::mouseMoveEvent(QMouseEvent* e) {
 
 void TrackSliderSlider::enterEvent(QEvent* e) {
   QSlider::enterEvent(e);
-  popup_->SetMouseOverSlider(true);
+  if (isEnabled()) {
+    popup_->SetMouseOverSlider(true);
+  }
 }
 
 void TrackSliderSlider::leaveEvent(QEvent* e) {