diff --git a/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml b/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml
index ea25a17ae..87f88f694 100644
--- a/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml
+++ b/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml
@@ -65,7 +65,12 @@ MessageDelegateContextMenu {
             text: i18n("View Source")
             icon.name: "code-context"
             onTriggered: {
-                messageSourceSheet.createObject(root, {'sourceText': root.source}).open();
+                applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml', {
+                    sourceText: root.source
+                }, {
+                    title: i18n("Message Source"),
+                    width: Kirigami.Units.gridUnit * 25
+                });
             }
         }
     ]
diff --git a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
index 8904df4de..3cd6bc4be 100644
--- a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
+++ b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
@@ -49,7 +49,12 @@ Loader {
             text: i18n("View Source")
             icon.name: "code-context"
             onTriggered: {
-                messageSourceSheet.createObject(page, {'sourceText': loadRoot.source}).open();
+                applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml', {
+                    sourceText: loadRoot.source
+                }, {
+                    title: i18n("Message Source"),
+                    width: Kirigami.Units.gridUnit * 25
+                });
             }
         }
     ]
diff --git a/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml b/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml
index efe7538f6..bf0048fc6 100644
--- a/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml
+++ b/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml
@@ -7,23 +7,38 @@ import QtQuick.Controls 2.15
 
 import org.kde.syntaxhighlighting 1.0
 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.neochat 1.0
 
-Kirigami.OverlaySheet {
-
+Kirigami.Page {
     property string sourceText
 
+    topPadding: 0
+    leftPadding: 0
+    rightPadding: 0
+    bottomPadding: 0
+
     title: i18n("Message Source")
 
-    TextArea {
-        id: sourceTextArea
-        text: sourceText
-        readOnly: true
-        wrapMode: Text.WordWrap
+    ScrollView {
+        anchors.fill: parent
+        contentWidth: availableWidth
+        TextArea {
+            id: sourceTextArea
+            text: sourceText
+            readOnly: true
+            textFormat: TextEdit.PlainText
+            wrapMode: Text.WordWrap
+            background: Rectangle {
+                Kirigami.Theme.colorSet: Kirigami.Theme.View
+                Kirigami.Theme.inherit: false
+                color: Kirigami.Theme.backgroundColor
+            }
 
-        SyntaxHighlighter {
-            textEdit: sourceTextArea
-            repository: Repository
-            definition: "JSON"
+            SyntaxHighlighter {
+                textEdit: sourceTextArea
+                definition: "JSON"
+                repository: Repository
+            }
         }
     }
 }
diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index 88bc30f13..02ce3dc98 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -713,12 +713,6 @@ Kirigami.ScrollablePage {
             MessageDelegateContextMenu {}
         }
 
-        Component {
-            id: messageSourceSheet
-
-            MessageSourceSheet {}
-        }
-
         Component {
             id: fileDelegateContextMenu