diff --git a/res/scripts/roomManager.js b/res/scripts/roomManager.js
index 1eebee1..0995ae9 100644
--- a/res/scripts/roomManager.js
+++ b/res/scripts/roomManager.js
@@ -18,6 +18,7 @@ function confirmAction (intent, sender) {
             intentEditPanel.style.display = 'block';
             intentEdit.setAttribute('required', true)
             intentFormAction.setAttribute('method', 'POST')
+            document.getElementById("intentRename").value = sender.parentElement.parentElement.querySelector("span").innerText;
             break
         case 'unconfirm':
             break
diff --git a/tpl/blocks/room_extra.html b/tpl/blocks/room_extra.html
index bfa60fe..9266764 100644
--- a/tpl/blocks/room_extra.html
+++ b/tpl/blocks/room_extra.html
@@ -54,7 +54,7 @@
 			
 			<form method="POST" action="/manage/room/rename">
 				<label for="name"></label>
-				<input type="text" name="name" required minlength="4" maxlength="64" />
+				<input type="text" name="name" required minlength="4" maxlength="64" value="{{order.ans('room_name')}}"/>
 				<input type="submit" value="Rename room" />
 			</form>
 		</article>