diff --git a/frontend/src/components/Chat.vue b/frontend/src/components/Chat.vue
index d0af5c8..d9a249b 100644
--- a/frontend/src/components/Chat.vue
+++ b/frontend/src/components/Chat.vue
@@ -21,7 +21,8 @@
 						@click="fillCmd(msg.cmd)">{{msg.cmd}} <i class="std-text" style="font-size:8pt;">{{msg.help}}</i></p>
 			</div>
 			<form @submit="sendChatMessage" id="msg-form">
-				<input id="my-msg" autocomplete="off" v-model="text" style="flex-grow:2;"/>
+				<input id="my-msg" autocomplete="off" v-model="text" style="flex-grow:2;"
+				@keydown.tab.prevent="tabComplete($event.target.value)"/>
 				<input id="submit-message" type="submit" class="btn" :value="$t('submit')"/>
 			</form>
 		</div>
@@ -164,6 +165,12 @@ export default {
 			this.text = cmd;
 			document.getElementById('my-msg').focus();
 		},
+		tabComplete() {
+			if (this.commandSuggestion.length > 0) {
+				let cmd = this.commandSuggestion[0].cmd;
+				this.text = cmd + ' ';
+			}
+		},
 		playEffects(path) {
 			const promise = (new Audio(path)).play();
 			if(promise !== undefined){