diff --git a/packages/core/components/ActionBar/styles.module.css b/packages/core/components/ActionBar/styles.module.css
index 76ae2893d3..ef14148b61 100644
--- a/packages/core/components/ActionBar/styles.module.css
+++ b/packages/core/components/ActionBar/styles.module.css
@@ -2,7 +2,7 @@
   display: flex;
   width: auto;
   padding: 4px;
-  padding-right: 0;
+  padding-right: 4px;
   border-top-left-radius: 8px;
   border-top-right-radius: 8px;
   border-radius: 8px;
@@ -33,6 +33,14 @@
   padding-right: 4px;
 }
 
+.ActionBar-group:last-of-type {
+  padding-right: 0;
+}
+
+.ActionBar-group:empty {
+  display: none;
+}
+
 .ActionBar-action {
   background: transparent;
   border: none;
diff --git a/packages/core/components/DraggableComponent/index.tsx b/packages/core/components/DraggableComponent/index.tsx
index dc43dfc5ce..af5dc6ff2d 100644
--- a/packages/core/components/DraggableComponent/index.tsx
+++ b/packages/core/components/DraggableComponent/index.tsx
@@ -34,9 +34,7 @@ const DefaultActionBar = ({
   children: ReactNode;
 }) => (
   <ActionBar label={label}>
-    <ActionBar.Group>
-      <DefaultOverride>{children}</DefaultOverride>
-    </ActionBar.Group>
+    <ActionBar.Group>{children}</ActionBar.Group>
   </ActionBar>
 );