diff --git a/app/View/Components/Documents/Form/Advanced.php b/app/View/Components/Documents/Form/Advanced.php
index c976fc360..39783de5d 100644
--- a/app/View/Components/Documents/Form/Advanced.php
+++ b/app/View/Components/Documents/Form/Advanced.php
@@ -22,6 +22,15 @@ class Advanced extends Component
             $categories = Category::enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
         }
 
-        return view('components.documents.form.advanced', compact('categories', 'category_type'));
+        $recurring_class = 'col-sm-6 col-md-6 col-lg-6 col-xl-6';
+        $more_class = 'col-sm-6 col-md-6 col-lg-6 col-xl-6';
+
+        if ($this->hideRecurring && (!$this->hideCategory || !$this->hideAttachment)) {
+            $more_class = 'col-sm-12 col-md-12 col-lg-12 col-xl-12';
+        } else if ($this->hideRecurring && ($this->hideCategory && $this->hideAttachment)) {
+            $recurring_class = 'col-sm-12 col-md-12 col-lg-12 col-xl-12';
+        }
+
+        return view('components.documents.form.advanced', compact('categories', 'category_type', 'recurring_class', 'more_class'));
     }
 }
diff --git a/resources/views/components/documents/form/advanced.blade.php b/resources/views/components/documents/form/advanced.blade.php
index 469bd8101..0879aaef6 100644
--- a/resources/views/components/documents/form/advanced.blade.php
+++ b/resources/views/components/documents/form/advanced.blade.php
@@ -7,13 +7,17 @@
         <div id="accordion-recurring-and-more-body" class="collapse hide" aria-labelledby="accordion-recurring-and-more-header">
             <div class="card-body">
                 <div class="row">
-                    <div class="col-sm-6 col-md-6 col-lg-6 col-xl-6">
-                        @if (!$hideRecurring)
+                    @stack('recurring_row_start')
+                    @if (!$hideRecurring)
+                        <div class="{{ $recurring_class }}">
                             {{ Form::recurring('create', null, 'col-md-12') }}
-                        @endif
-                    </div>
+                        </div>
+                    @endif
+                    @stack('recurring_row_end')
 
-                    <div class="col-sm-6 col-md-6 col-lg-6 col-xl-6">
+                    @stack('more_row_start')
+                    @if (!$hideCategory && !$hideAttachment)
+                    <div class="{{ $more_class }}">
                         @if (!$hideCategory)
                             {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.' . $categoryType . '_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=' . $categoryType, 'remote_action' => route('categories.index'). '?type=' . $categoryType], 'col-md-12') }}
                         @endif
@@ -22,6 +26,8 @@
                             {{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'form-file'], null, 'col-md-12') }}
                         @endif
                     </div>
+                    @endif
+                    @stack('more_row_end')
                 </div>
             </div>
         </div>