diff --git a/Userland/Applications/PixelPaint/PixelPaintWindow.gml b/Userland/Applications/PixelPaint/PixelPaintWindow.gml
index 22dde31f242..df2e051ffaf 100644
--- a/Userland/Applications/PixelPaint/PixelPaintWindow.gml
+++ b/Userland/Applications/PixelPaint/PixelPaintWindow.gml
@@ -16,11 +16,15 @@
 
     @GUI::Widget {
         layout: @GUI::HorizontalBoxLayout {
-            spacing: 0
+            spacing: 2
         }
 
-        @PixelPaint::ToolboxWidget {
-            name: "toolbox"
+        @GUI::ToolbarContainer {
+            name: "toolbar_container"
+
+            @PixelPaint::ToolboxWidget {
+                name: "toolbox"
+            }
         }
 
         @GUI::Widget {