diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp
index 0a2cdc7..185fd77 100644
--- a/src/FloatingDockContainer.cpp
+++ b/src/FloatingDockContainer.cpp
@@ -683,6 +683,11 @@ CFloatingDockContainer::CFloatingDockContainer(CDockManager *DockManager) :
         {
             native_window = false;
         }
+		QString WaylandDisplay = qgetenv("WAYLAND_DISPLAY").toLower();
+		if (WaylandDisplay != "")
+		{
+			native_window = false;
+		}
     }
 
 	if (native_window)
@@ -694,7 +699,7 @@ CFloatingDockContainer::CFloatingDockContainer(CDockManager *DockManager) :
 	{
 		d->TitleBar = new CFloatingWidgetTitleBar(this);
 		setTitleBarWidget(d->TitleBar);
-		setWindowFlags(Qt::Window | Qt::WindowMinMaxButtonsHint | Qt::FramelessWindowHint);
+		setWindowFlags(Qt::Window | Qt::WindowMinMaxButtonsHint | Qt::BypassWindowManagerHint);
 		d->TitleBar->enableCloseButton(isClosable());
 		connect(d->TitleBar, SIGNAL(closeRequested()), SLOT(close()));
 		connect(d->TitleBar, &CFloatingWidgetTitleBar::maximizeRequested,