diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 079e8f6c3d63..fe46b22d50a8 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -1332,7 +1332,7 @@ class Invoice extends EntityModel implements BalanceAffecting
     /**
      * @return int
      */
-    public function countDocuments()
+    public function countDocuments($expenses = false)
     {
         $count = count($this->documents);
 
@@ -1342,6 +1342,14 @@ class Invoice extends EntityModel implements BalanceAffecting
             }
         }
 
+        if ($expenses) {
+            foreach ($expenses as $expense) {
+                if ($expense->invoice_documents) {
+                    $count += count($expense->documents);
+                }
+            }
+        }
+
         return $count;
     }
 
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 6b626c74f244..9d9bfb4cdc30 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -285,7 +285,7 @@
                         @if ($account->hasFeature(FEATURE_DOCUMENTS))
                             <li role="presentation"><a href="#attached-documents" aria-controls="attached-documents" role="tab" data-toggle="tab">
                                 {{ trans("texts.invoice_documents") }}
-                                @if ($count = $invoice->countDocuments())
+                                @if ($count = ($invoice->countDocuments($expenses)))
                                     ({{ $count }})
                                 @endif
                             </a></li>
@@ -340,9 +340,16 @@
                                         <input type="hidden" name="document_ids[]" data-bind="value: public_id"/>
                                     </div>
                                 </div>
-                                @if ($invoice->hasExpenseDocuments())
+                                @if ($invoice->hasExpenseDocuments() || count($expenses))
                                     <h4>{{trans('texts.documents_from_expenses')}}</h4>
-                                    @foreach($invoice->expenses as $expense)
+									@foreach($invoice->expenses as $expense)
+										@if ($expense->invoice_documents)
+	                                        @foreach($expense->documents as $document)
+	                                            <div>{{$document->name}}</div>
+	                                        @endforeach
+										@endif
+                                    @endforeach
+									@foreach($expenses as $expense)
 										@if ($expense->invoice_documents)
 	                                        @foreach($expense->documents as $document)
 	                                            <div>{{$document->name}}</div>