diff --git a/packages/volto/news/6010.bugfix b/packages/volto/news/6010.bugfix
new file mode 100644
index 0000000000..fdd6672a40
--- /dev/null
+++ b/packages/volto/news/6010.bugfix
@@ -0,0 +1 @@
+Fixed separator edit class spilling outside of the block toolbar @JeffersonBledsoe
diff --git a/packages/volto/theme/themes/pastanaga/extras/blocks.less b/packages/volto/theme/themes/pastanaga/extras/blocks.less
index 9c6fd5cd2a..7ebbff26f2 100644
--- a/packages/volto/theme/themes/pastanaga/extras/blocks.less
+++ b/packages/volto/theme/themes/pastanaga/extras/blocks.less
@@ -318,6 +318,16 @@ body.has-toolbar.has-sidebar-collapsed .ui.wrapper > .ui.inner.block.full {
       0 2px 4px rgba(0, 0, 0, 0.05);
     transform: translate(-50%, 0);
 
+    .separator {
+      position: relative;
+      top: 5px;
+      display: inline-block;
+      height: 24px;
+      border-right: 1px solid #ddd;
+      margin: 0 0 4px 4px;
+      vertical-align: bottom;
+    }
+
     form {
       display: flex;
     }
@@ -591,16 +601,6 @@ body.has-toolbar.has-sidebar-collapsed .ui.wrapper > .ui.inner.block.full {
   height: 100%;
 }
 
-.separator {
-  position: relative;
-  top: 5px;
-  display: inline-block;
-  height: 24px;
-  border-right: 1px solid #ddd;
-  margin: 0 0 4px 4px;
-  vertical-align: bottom;
-}
-
 // HTML block
 .html-editor {
   z-index: 1;