diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index d9a67a8400f..13774c12651 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -892,14 +892,14 @@ bool isPositioner(const SelectionContext &context)
 
 bool layoutOptionVisible(const SelectionContext &context)
 {
-    return multiSelectionAndInBaseState(context)
+    return selectionCanBeLayoutedAndQtQuickLayoutPossible(context)
             || singleSelectionAndInQtQuickLayout(context)
             || isLayout(context);
 }
 
 bool positionOptionVisible(const SelectionContext &context)
 {
-    return multiSelectionAndInBaseState(context)
+    return selectionCanBeLayouted(context)
             || isPositioner(context);
 }