diff --git a/frontend/src/Apps/Msg.vue b/frontend/src/Apps/Msg.vue
index dfdf50d..709f8c4 100644
--- a/frontend/src/Apps/Msg.vue
+++ b/frontend/src/Apps/Msg.vue
@@ -11,6 +11,7 @@
 
 	const msgContent = ref("");
 	const addMember = ref(false);
+	const currentTitle = ref("");
 
 	function formatTime(date){
 		return date.getHours() + ":" + date.getMinutes() + " " + date.getDate() + "/" + date.getMonth();
@@ -21,11 +22,11 @@
 <template>
 	<div id="msg">
 		<div id="discList">
-			<div @click="fetchDiscussion(discussion.id)" class="discItem" v-for="discussion in discussionsList" :key="discussion.id">{{ discussion.name }}</div>
+			<div @click="fetchDiscussion(discussion.id).then(e => currentTitle = currentDiscussion.name)" class="discItem" v-for="discussion in discussionsList" :key="discussion.id">{{ discussion.name }}</div>
 			<button id="createDiscussion" @click="createDiscussion('New Discussion')">+</button>
 		</div>
 		<div id="discussion" v-if="currentDiscussion.length != 0">
-			<h1 id=msgName ><input class="InputTitle" type="text" @change="updateDiscussionName(currentDiscussion.id, currentDiscussion.name)" v-model="currentDiscussion.name"></h1>
+			<h1 id=msgName ><input class="InputTitle" type="text" @change="updateDiscussionName(currentDiscussion.id, currentTitle)" v-model="currentTitle"></h1>
 			<div id=msgs>
 				<div class="msg" v-for="msg in currentDiscussion.msgs" :sender="msg.sender" :key="msg.id">
 					{{ msg.content }}<br/>
@@ -33,8 +34,8 @@
 				</div>
 			</div>
 			<div id=messageBox>
-				<input type="text" v-model="msgContent">
-				<input type="submit" @click="sendMessage(currentDiscussion.id, msgContent, null)" value="send">
+				<input type="text" @keyup.enter="sendMessage(currentDiscussion.id, msgContent, null); msgContent = ''" v-model="msgContent">
+				<input type="submit" @click="sendMessage(currentDiscussion.id, msgContent, null); msgContent = ''" value="send">
 			</div>
 		</div>
 		<div id="members" v-if="currentDiscussion.length != 0">