diff --git a/scenes/ui/chat.tscn b/scenes/ui/chat.tscn
index d7d3e2f..6db8e8f 100644
--- a/scenes/ui/chat.tscn
+++ b/scenes/ui/chat.tscn
@@ -16,7 +16,6 @@ size_flags_horizontal = 3
 size_flags_vertical = 3
 mouse_filter = 2
 theme_override_constants/margin_left = 50
-theme_override_constants/margin_top = 20
 theme_override_constants/margin_right = 50
 
 [node name="MsgVBox" type="VBoxContainer" parent="MsgMargin"]
@@ -50,7 +49,7 @@ alignment = 2
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = 1016.0
+offset_top = 1010.0
 grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 3
@@ -63,8 +62,6 @@ theme_override_constants/margin_bottom = 20
 [node name="EditVBox" type="VBoxContainer" parent="EditMargin"]
 layout_mode = 2
 mouse_filter = 2
-theme_override_constants/separation = 0
-alignment = 2
 
 [node name="MessageEdit" type="LineEdit" parent="EditMargin/EditVBox"]
 layout_mode = 2
diff --git a/scripts/ui/chat.gd b/scripts/ui/chat.gd
index fb1b80f..c568ea5 100644
--- a/scripts/ui/chat.gd
+++ b/scripts/ui/chat.gd
@@ -36,6 +36,7 @@ func _unhandled_input(event: InputEvent) -> void:
 		open = true
 		_message_edit.visible = true
 		_message_edit.grab_focus()
+		_msg_scroll.vertical_scroll_mode = ScrollContainer.SCROLL_MODE_AUTO
 		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
 
 
@@ -43,6 +44,7 @@ func _close() -> void:
 	open = false
 	_message_edit.release_focus()
 	_message_edit.visible = false
+	_msg_scroll.vertical_scroll_mode = ScrollContainer.SCROLL_MODE_SHOW_NEVER
 	Input.mouse_mode = Input.MOUSE_MODE_CAPTURED