diff --git a/src/mixins/editorMixin.js b/src/mixins/editorMixin.js
index 78426bd4e..80b3f27e4 100644
--- a/src/mixins/editorMixin.js
+++ b/src/mixins/editorMixin.js
@@ -151,6 +151,9 @@ export default {
 					readOnly: false,
 					shareToken: this.shareTokenParam || null,
 					autofocus: false,
+					onCreate: ({ markdown }) => {
+						this.updateEditorContentDebounced(markdown)
+					},
 					onLoaded: () => {
 						this.done('editor')
 					},
diff --git a/src/mixins/pageContentMixin.js b/src/mixins/pageContentMixin.js
index 4390e1bad..4f6970a15 100644
--- a/src/mixins/pageContentMixin.js
+++ b/src/mixins/pageContentMixin.js
@@ -22,13 +22,16 @@ export default {
 		 * @param {string} davUrl URL to fetch page via DAV
 		 */
 		async fetchPageContent(davUrl) {
+			// Add `timestamp` as cache buster param
+			const axiosConfig = {
+				params: {
+					timestamp: Math.floor(Date.now() / 1000),
+				},
+			}
 			// Authenticate via share token for public shares
-			let axiosConfig = {}
 			if (this.isPublic) {
-				axiosConfig = {
-					auth: {
-						username: this.shareTokenParam,
-					},
+				axiosConfig.auth = {
+					username: this.shareTokenParam,
 				}
 			}