diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd
index 305c0bec3..bc47e94fa 100644
--- a/src/Autoload/Global.gd
+++ b/src/Autoload/Global.gd
@@ -123,7 +123,7 @@ onready var vertical_ruler: BaseButton = control.find_node("VerticalRuler")
 onready var transparent_checker: ColorRect = control.find_node("TransparentChecker")
 onready var preview_zoom_slider: VSlider = control.find_node("PreviewZoomSlider")
 
-onready var tool_panel: Panel = control.find_node("Tools")
+onready var tool_panel: ScrollContainer = control.find_node("Tools")
 onready var color_pickers: Container = control.find_node("Color Pickers")
 onready var left_tool_options_scroll: ScrollContainer = control.find_node("Left Tool Options")
 onready var right_tool_options_scroll: ScrollContainer = control.find_node("Right Tool Options")
diff --git a/src/UI/ToolButtons.gd b/src/UI/ToolButtons.gd
index 1a901438f..308f6d792 100644
--- a/src/UI/ToolButtons.gd
+++ b/src/UI/ToolButtons.gd
@@ -74,6 +74,3 @@ func _on_Tools_resized() -> void:
 		columns = tool_panel_size.x / 28.5
 	else:
 		columns = tool_panel_size.x / 36.5
-
-	# It doesn't actually set the size to zero, it just resets it
-	get_parent().rect_size = Vector2.ZERO
diff --git a/src/UI/Tools.tscn b/src/UI/Tools.tscn
index f22a90f9f..ee26f9229 100644
--- a/src/UI/Tools.tscn
+++ b/src/UI/Tools.tscn
@@ -20,22 +20,19 @@
 [ext_resource path="res://assets/graphics/tools/zoom.png" type="Texture" id=18]
 [ext_resource path="res://assets/graphics/tools/tool_background.png" type="Texture" id=19]
 
-[node name="Tools" type="Panel"]
-margin_left = 4.0
-margin_top = 8.0
-margin_right = 46.0
-margin_bottom = 716.0
-rect_min_size = Vector2( 42, 32 )
-rect_clip_content = true
+[node name="Tools" type="ScrollContainer"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+rect_min_size = Vector2( 42, 0 )
+size_flags_horizontal = 0
+size_flags_vertical = 0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="PanelContainer" type="PanelContainer" parent="."]
-margin_left = 9.0
-margin_top = 5.0
-margin_right = 47.0
-margin_bottom = 491.0
+margin_right = 38.0
+margin_bottom = 486.0
 size_flags_horizontal = 0
 size_flags_vertical = 0
 __meta__ = {
diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn
index dfb7786ca..49086ce5f 100644
--- a/src/UI/UI.tscn
+++ b/src/UI/UI.tscn
@@ -187,6 +187,10 @@ tabs_visible = false
 layout = SubResource( 25 )
 
 [node name="Tools" parent="DockableContainer" instance=ExtResource( 1 )]
+margin_left = 4.0
+margin_top = 8.0
+margin_right = -1234.0
+margin_bottom = -4.0
 
 [node name="Main Canvas" type="VBoxContainer" parent="DockableContainer"]
 margin_left = 66.0