diff --git a/daemon b/daemon
index b2937e7a..8c7d11a3 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit b2937e7a60da94e31d501b37e9240a7fc88a8b71
+Subproject commit 8c7d11a3f71844f08b41fb34e4a6ab645f04559b
diff --git a/src/app/mainview/components/CallActionBar.qml b/src/app/mainview/components/CallActionBar.qml
index 401be4bc..8186a8e7 100644
--- a/src/app/mainview/components/CallActionBar.qml
+++ b/src/app/mainview/components/CallActionBar.qml
@@ -365,8 +365,11 @@ Control {
         },
         Action {
             id: layoutAction
-            property bool openPopupWhenClicked: true
-            checkable: !openPopupWhenClicked
+            onTriggered: {
+                if (!isGrid)
+                    CallAdapter.showGridConferenceLayout()
+            }
+            checkable: true
             icon.source: JamiResources.mosaic_black_24dp_svg
             icon.color: "white"
             text: JamiStrings.layoutSettings