diff --git a/client/web/compose/src/components/PageBlocks/Wrap/base.vue b/client/web/compose/src/components/PageBlocks/Wrap/base.vue
index ab0acddca..bdcd9de0a 100644
--- a/client/web/compose/src/components/PageBlocks/Wrap/base.vue
+++ b/client/web/compose/src/components/PageBlocks/Wrap/base.vue
@@ -41,7 +41,8 @@ export default {
     },
 
     isBlockMagnified () {
-      return this.magnified
+      const { magnifiedBlockID } = this.$route.query
+      return this.magnified && magnifiedBlockID === this.block.blockID
     },
 
     headerSet () {
diff --git a/client/web/compose/src/components/Public/Page/Block/Modal.vue b/client/web/compose/src/components/Public/Page/Block/Modal.vue
index dd5333c3f..1c746c5f7 100644
--- a/client/web/compose/src/components/Public/Page/Block/Modal.vue
+++ b/client/web/compose/src/components/Public/Page/Block/Modal.vue
@@ -9,8 +9,7 @@
     hide-header
     hide-footer
     size="xl"
-    no-fade
-    @hidden="hideModal"
+    @hidden="onHidden"
   >
     <page-block
       v-if="showModal"
@@ -79,34 +78,14 @@ export default {
     },
   },
 
-  watch: {
-    '$route.query.magnifiedBlockID': {
-      immediate: true,
-      handler (magnifiedBlockID, oldMagnifiedBlockID) {
-        if (!magnifiedBlockID) {
-          this.showModal = false
-          return
-        }
-
-        if (this.showModal && (magnifiedBlockID !== oldMagnifiedBlockID)) {
-          this.showModal = false
-
-          setTimeout(() => {
-            this.$router.push({ query: { ...this.$route.query, magnifiedBlockID } })
-          }, 300)
-
-          return
-        }
-
-        this.$nextTick(() => {
-          this.loadModal(magnifiedBlockID)
-        })
-      },
-    },
-  },
-
   mounted () {
     this.$root.$on('magnify-page-block', this.magnifyPageBlock)
+
+    const { magnifiedBlockID } = this.$route.query
+
+    if (magnifiedBlockID) {
+      this.magnifyPageBlock({ blockID: magnifiedBlockID })
+    }
   },
 
   beforeDestroy () {
@@ -117,7 +96,16 @@ export default {
     magnifyPageBlock ({ blockID, block } = {}) {
       this.customBlock = block
       const magnifiedBlockID = blockID || (block || {}).blockID
-      this.$router.push({ query: { ...this.$route.query, magnifiedBlockID } })
+      this.loadModal(magnifiedBlockID)
+
+      setTimeout(() => {
+        this.$router.push({
+          query: {
+            ...this.$route.query,
+            magnifiedBlockID,
+          },
+        })
+      }, 300)
     },
 
     loadModal (blockID) {
@@ -150,9 +138,15 @@ export default {
       }
     },
 
-    hideModal () {
-      this.showModal = false
-      this.$router.push({ query: { ...this.$route.query, magnifiedBlockID: undefined } })
+    onHidden () {
+      setTimeout(() => {
+        this.$router.push({
+          query: {
+            ...this.$route.query,
+            magnifiedBlockID: undefined,
+          },
+        })
+      }, 300)
     },
   },
 }
diff --git a/client/web/compose/src/components/Public/Record/Modal.vue b/client/web/compose/src/components/Public/Record/Modal.vue
index 9ff74a7f9..e8debaf1d 100644
--- a/client/web/compose/src/components/Public/Record/Modal.vue
+++ b/client/web/compose/src/components/Public/Record/Modal.vue
@@ -8,8 +8,7 @@
     body-class="p-0 bg-gray"
     footer-class="p-0"
     size="xl"
-    no-fade
-    @hidden="hideModal"
+    @hidden="onHidden"
   >
     <template #modal-title>
       <portal-target
@@ -24,6 +23,7 @@
       :module="module"
       :record-i-d="recordID"
       show-record-modal
+      @handle-record-redirect="loadRecord"
     />
 
     <template #modal-footer>
@@ -81,17 +81,9 @@ export default {
   },
 
   watch: {
-    '$route.query.recordID': {
+    '$route.query.recordPageID': {
       immediate: true,
-      handler (recordID, oldRecordID) {
-        const { recordPageID } = this.$route.query
-        const { pageID: oldRecordPageID } = this.page || {}
-
-        if (!recordID) {
-          this.showModal = false
-          return
-        }
-
+      handler (recordPageID, oldRecordPageID) {
         if (recordPageID !== oldRecordPageID) {
           // If the page changed we need to clear the record pagination since its not relevant anymore
           if (this.recordPaginationUsable) {
@@ -99,41 +91,19 @@ export default {
           } else {
             this.clearRecordIDs()
           }
-
-          if (this.showModal && (recordID !== oldRecordID)) {
-            this.showModal = false
-
-            setTimeout(() => {
-              this.$router.push({
-                query: {
-                  ...this.$route.query,
-                  recordID,
-                  recordPageID,
-                },
-              })
-            }, 300)
-
-            return
-          }
         }
-
-        this.$nextTick(() => {
-          this.loadModal({ recordID, recordPageID })
-        })
       },
     },
   },
 
   mounted () {
-    this.$root.$on('show-record-modal', ({ recordID, recordPageID }) => {
-      this.$router.push({
-        query: {
-          ...this.$route.query,
-          recordID,
-          recordPageID,
-        },
-      })
-    })
+    this.$root.$on('show-record-modal', this.loadRecord)
+
+    const { recordID, recordPageID } = this.$route.query
+
+    if (recordID && recordPageID) {
+      this.loadRecord({ recordID, recordPageID })
+    }
   },
 
   beforeDestroy () {
@@ -146,27 +116,49 @@ export default {
       clearRecordIDs: 'ui/clearRecordIDs',
     }),
 
+    loadRecord ({ recordID, recordPageID }) {
+      this.loadModal({ recordID, recordPageID })
+
+      setTimeout(() => {
+        this.$router.push({
+          query: {
+            ...this.$route.query,
+            recordID,
+            recordPageID,
+          },
+        })
+      }, 300)
+    },
+
     loadModal ({ recordID, recordPageID }) {
       if (recordID && recordPageID) {
         this.recordID = recordID
-        this.page = this.getPageByID(recordPageID)
 
-        if (this.page) {
+        if (!this.page || this.page.pageID !== recordPageID) {
+          this.page = this.getPageByID(recordPageID)
+        }
+
+        if (this.page && (!this.module || this.module.moduleID !== this.page.moduleID)) {
           this.module = this.getModuleByID(this.page.moduleID)
+        }
+
+        if (this.page && this.module) {
           this.showModal = true
         }
       }
     },
 
-    hideModal () {
-      this.$router.push({
-        query: {
-          ...this.$route.query,
-          recordID: undefined,
-          moduleID: undefined,
-          recordPageID: undefined,
-        },
-      })
+    onHidden () {
+      setTimeout(() => {
+        this.$router.push({
+          query: {
+            ...this.$route.query,
+            recordID: undefined,
+            moduleID: undefined,
+            recordPageID: undefined,
+          },
+        })
+      }, 300)
     },
   },
 }
diff --git a/client/web/compose/src/views/Public/Pages/Records/View.vue b/client/web/compose/src/views/Public/Pages/Records/View.vue
index f232fd63e..beb12afd9 100644
--- a/client/web/compose/src/views/Public/Pages/Records/View.vue
+++ b/client/web/compose/src/views/Public/Pages/Records/View.vue
@@ -39,6 +39,7 @@
       :to="portalRecordToolbar"
     >
       <record-toolbar
+        v-if="layout"
         :module="module"
         :record="record"
         :labels="recordToolbarLabels"
@@ -378,9 +379,7 @@ export default {
       if (!recordID) return
 
       if (this.showRecordModal) {
-        this.$router.push({
-          query: { ...this.$route.query, recordID },
-        })
+        this.$emit('handle-record-redirect', { recordID, recordPageID: this.page.pageID })
       } else {
         this.$router.push({
           params: { ...this.$route.params, recordID },