diff --git a/src/app/puzzle/layout/vplayout.cpp b/src/app/puzzle/layout/vplayout.cpp
index 0dfd2f8df..0dee14286 100644
--- a/src/app/puzzle/layout/vplayout.cpp
+++ b/src/app/puzzle/layout/vplayout.cpp
@@ -327,6 +327,16 @@ void VPLayout::SetFocusedSheet(const VPSheetPtr &focusedSheet)
         m_focusedSheet = focusedSheet.isNull() ? m_sheets.constFirst() : focusedSheet;
     }
 
+    if (LayoutSettings().GetWarningSuperpositionOfPieces())
+    {
+        m_focusedSheet->ValidateSuperpositionOfPieces();
+    }
+
+    if (LayoutSettings().GetWarningPieceGapePosition())
+    {
+        m_focusedSheet->ValidatePieceGapePosition();
+    }
+
     emit ActiveSheetChanged(m_focusedSheet);
 }