diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp
index 4881da26..f859a299 100644
--- a/src/LayoutSaver.cpp
+++ b/src/LayoutSaver.cpp
@@ -838,7 +838,7 @@ void LayoutSaver::FloatingWindow::fromVariantMap(const QVariantMap &map)
     geometry = Layouting::mapToRect(map.value(QStringLiteral("geometry")).toMap());
     normalGeometry = Layouting::mapToRect(map.value(QStringLiteral("normalGeometry")).toMap());
     screenIndex = map.value(QStringLiteral("screenIndex")).toInt();
-    flags = map.value(QStringLiteral("flags")).toInt();
+    flags = map.value(QStringLiteral("flags"), int(FloatingWindowFlag::FromGlobalConfig)).toInt();
     screenSize = Layouting::mapToSize(map.value(QStringLiteral("screenSize")).toMap());
     isVisible = map.value(QStringLiteral("isVisible")).toBool();
     affinities = variantToStringList(map.value(QStringLiteral("affinities")).toList());
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index 97be5dd2..36572dab 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -8000,7 +8000,5 @@ void TestDocks::tst_restoreFlagsFromVersion16()
 
     auto floatingWindow = dock1->floatingWindow();
     QVERIFY(floatingWindow);
-
-    QEXPECT_FAIL("", "Fixing", Continue);
     QCOMPARE(floatingWindow->floatingWindowFlags(), FloatingWindowFlag::HideTitleBarWhenTabsVisible);
 }