diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index 8fc85215412..8315a2614aa 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -1125,4 +1125,8 @@ export default {
 	overflow: hidden;
 	outline-offset: -2px;
 }
+
+:deep(#app-settings-header) {
+	padding-top: calc(var(--default-grid-baseline) * 2);
+}
 </style>
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 738e8449f15..928a89faa94 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -738,6 +738,8 @@ export default {
 				})
 				this.chatExtrasStore.removeMessageIdToEdit(this.token)
 				this.resetTypingIndicator()
+				// refocus input as the user might want to type further
+				this.focusInput()
 			} catch {
 				this.$emit('failure')
 				showError(t('spreed', 'The message could not be edited'))
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index d8ace74e134..6b6159b87dd 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -368,7 +368,11 @@ export default {
 				this.unreadNotificationHandle = null
 			}
 			if (message) {
-				this.unreadNotificationHandle = showMessage(message)
+				this.unreadNotificationHandle = showMessage(message, {
+					onClick: () => {
+						this.openSidebar('chat')
+					},
+				})
 			}
 		},