diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp
index a43aedaf..93d3950c 100644
--- a/src/widgets/capture/capturewidget.cpp
+++ b/src/widgets/capture/capturewidget.cpp
@@ -136,10 +136,9 @@ CaptureWidget::CaptureWidget(const uint id,
         move(currentScreen->geometry().x(), currentScreen->geometry().y());
         resize(currentScreen->size());
 #else
-        // Disable Qt::BypassWindowManagerHint. Workaround for #583 #517
-        setWindowFlags(/* Qt::BypassWindowManagerHint */
-                       Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint |
+        setWindowFlags(Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint |
                        Qt::Tool);
+        resize(pixmap().size());
 #endif
     }
     // Create buttons