diff --git a/resources/views/layouts/block.blade.php b/resources/views/layouts/block.blade.php
index 1be750a8a3..6a0cfbef80 100644
--- a/resources/views/layouts/block.blade.php
+++ b/resources/views/layouts/block.blade.php
@@ -1,20 +1,29 @@
 <fieldset class="row g-0 mb-3">
     @if(!empty($title) || !empty($description))
-    <div class="col p-0 px-3">
-        <legend class="text-body-emphasis px-2 mt-2">
-            {{ __($title ?? '') }}
+        <div class="col p-0 px-3">
+            <legend class="text-body-emphasis px-2 mt-2">
+                {{ __($title ?? '') }}
 
-            @if(!empty($description))
-            <p class="small text-muted mt-2 mb-0 text-balance">
-                {!! __($description  ?? '') !!}
-            </p>
-            @endif
-        </legend>
-    </div>
+                @if(!empty($description))
+                    <p class="small text-muted mt-2 mb-0 text-balance">
+                        {!! __($description  ?? '') !!}
+                    </p>
+                @endif
+            </legend>
+        </div>
     @endif
     <div class="col-12 {{!$vertical ? 'col-md-7' : ''}} shadow-sm h-100">
+        @if($commandBar && $topCommandBar)
+            <div class="bg-light px-4 py-3 d-flex justify-content-end rounded-top gap-2">
+                @foreach($commandBar as $command)
+                    <div>
+                        {!! $command !!}
+                    </div>
+                @endforeach
+            </div>
+        @endif
 
-        <div class="bg-white d-flex flex-column layout-wrapper {{ empty($commandBar) ? 'rounded' : 'rounded-top' }}">
+        <div class="bg-white d-flex flex-column layout-wrapper {{ empty($commandBar) ? 'rounded' : ($topCommandBar ? 'rounded-bottom' : 'rounded-top') }}">
             @foreach($manyForms as $key => $layouts)
                 @foreach($layouts as $layout)
                     {!! $layout ?? '' !!}
@@ -22,7 +31,7 @@
             @endforeach
         </div>
 
-        @empty(!$commandBar)
+        @if($commandBar && !$topCommandBar)
             <div class="bg-light px-4 py-3 d-flex justify-content-end rounded-bottom gap-2">
                 @foreach($commandBar as $command)
                     <div>
@@ -30,7 +39,7 @@
                     </div>
                 @endforeach
             </div>
-        @endempty
+        @endif
     </div>
 </fieldset>
 
diff --git a/src/Screen/Layouts/Block.php b/src/Screen/Layouts/Block.php
index 3ff454cd63..0103a13f3f 100644
--- a/src/Screen/Layouts/Block.php
+++ b/src/Screen/Layouts/Block.php
@@ -27,6 +27,7 @@ abstract class Block extends Layout
      */
     protected $variables = [
         'vertical' => false,
+        'topCommandBar' => false,
     ];
 
     /**
@@ -98,11 +99,14 @@ public function vertical($vertical = true): self
         return $this;
     }
 
+
     /**
      * @param Action|Action[] description
      */
-    public function commands($commands): self
+    public function commands($commands, $top = false): self
     {
+        $this->variables['topCommandBar'] = $top;
+
         $this->commandBar = Arr::wrap($commands);
 
         return $this;