diff --git a/client/components/Chat.vue b/client/components/Chat.vue
index 2537d81d..f763e2d5 100644
--- a/client/components/Chat.vue
+++ b/client/components/Chat.vue
@@ -25,6 +25,7 @@
 							:value="channel.topic"
 							class="topic-input"
 							placeholder="Set channel topic"
+							enterkeyhint="done"
 							@keyup.enter="saveTopic"
 							@keyup.esc="channel.editTopic = false"
 						/>
diff --git a/client/components/ChatInput.vue b/client/components/ChatInput.vue
index a384b2ec..5d0eb10e 100644
--- a/client/components/ChatInput.vue
+++ b/client/components/ChatInput.vue
@@ -7,6 +7,7 @@
 			ref="input"
 			dir="auto"
 			class="mousetrap"
+			enterkeyhint="send"
 			:value="channel.pendingMessage"
 			:placeholder="getInputPlaceholder(channel)"
 			:aria-label="getInputPlaceholder(channel)"