diff --git a/src/widgets/basewindow.cpp b/src/widgets/basewindow.cpp
index c832597fa..5e533357b 100644
--- a/src/widgets/basewindow.cpp
+++ b/src/widgets/basewindow.cpp
@@ -34,7 +34,7 @@ namespace widgets {
 
 BaseWindow::BaseWindow(QWidget *parent, Flags _flags)
     : BaseWidget(parent,
-                 Qt::Window | ((_flags & TopMost) ? Qt::WindowStaysOnTopHint : (Qt::WindowFlags)0))
+                 Qt::Window | ((_flags & TopMost) ? Qt::WindowStaysOnTopHint : Qt::WindowFlags(0)))
     , enableCustomFrame(_flags & EnableCustomFrame)
     , frameless(_flags & FrameLess)
     , flags(_flags)
diff --git a/src/widgets/tooltipwidget.cpp b/src/widgets/tooltipwidget.cpp
index 4d69c66e1..566b9c8bb 100644
--- a/src/widgets/tooltipwidget.cpp
+++ b/src/widgets/tooltipwidget.cpp
@@ -37,7 +37,7 @@ TooltipWidget::TooltipWidget(BaseWidget *parent)
     this->setStayInScreenRect(true);
 
     this->setAttribute(Qt::WA_ShowWithoutActivating);
-    this->setWindowFlags(Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint |
+    this->setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint |
                          Qt::BypassWindowManagerHint);
 
     displayText->setAlignment(Qt::AlignHCenter);