diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp
index c63af5b..cca3465 100644
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -320,11 +320,13 @@ CMainWindow::CMainWindow(QWidget *parent) :
 	// a QToolButton instead of a QPushButton
 	// CDockManager::setConfigFlags(CDockManager::configFlags() | CDockManager::TabCloseButtonIsToolButton);
 
-	// uncomment the following line if you wand a fixed tab width that does
+    // uncomment the following line if you want a fixed tab width that does
 	// not change if the visibility of the close button changes
-	//CDockManager::setConfigFlag(CDockManager::OpaqueUndocking, false);
-	//CDockManager::setConfigFlag(CDockManager::DragPreviewIsDynamic, false);
-	CDockManager::setConfigFlags(CDockManager::NonOpaqueWithWindowFrame);
+    // CDockManager::setConfigFlag(CDockManager::RetainTabSizeWhenCloseButtonHidden, true);
+
+    // uncomment the follwing line if you want to use non opaque undocking and splitter
+    // moevements
+    //CDockManager::setConfigFlags(CDockManager::DefaultNonOpaqueConfig);
 
 	// Now create the dock manager and its content
 	d->DockManager = new CDockManager(this);
diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp
index 6fa861f..0c9092d 100644
--- a/src/FloatingDockContainer.cpp
+++ b/src/FloatingDockContainer.cpp
@@ -507,17 +507,9 @@ void CFloatingDockContainer::startFloating(const QPoint &DragStartMousePos,
 	d->setState(DragState);
 	d->DragStartMousePosition = DragStartMousePos;
 #ifdef Q_OS_LINUX
-	// I have not found a way on Linux to display the floating widget behind the
-	// dock overlay. That means if the user drags this floating widget around,
-	// it is always painted in front of the dock overlay and dock overlay cross.
-	// and the user will not see the dock overlay. To work around this issue,
-	// the window opacity is set to 0.6 to make the dock overlay visible
-	// again. If someone has an idea, how to place the dragged floating widget
-	// behind the dock overlay, then a pull request would be welcome.
 	if (DraggingFloatingWidget == DragState)
 	{
 		setAttribute(Qt::WA_X11NetWmWindowTypeDock, true);
-		setWindowOpacity(0.6);
 		d->MouseEventHandler = MouseEventHandler;
 		if (d->MouseEventHandler)
 		{