diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 0c5eecad146a..7e7585fb06d0 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2425,6 +2425,7 @@ $LANG = array(
     'include_errors' => 'Include Errors',
     'include_errors_help' => 'Include :link from storage/logs/laravel-error.log',
     'recent_errors' => 'recent errors',
+    'add_item' => 'Add Item',
 
 );
 
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 2ae826939297..a714bfd79cfc 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -536,8 +536,10 @@
 					@endif
                     @if ($invoice->id)
                         {!! DropdownButton::normal(trans('texts.more_actions'))->withContents($invoice->present()->moreActions())->dropup() !!}
-                    @elseif ( ! $invoice->isQuote() && Request::is('*/clone'))
+                    @elseif (! $invoice->isQuote() && Request::is('*/clone'))
                         {!! Button::normal(trans($invoice->is_recurring ? 'texts.disable_recurring' : 'texts.enable_recurring'))->withAttributes(['id' => 'recurrButton', 'onclick' => 'onRecurrClick()'])->appendIcon(Icon::create('repeat')) !!}
+					@elseif (! empty($tasks))
+						{!! Button::normal(trans('texts.add_item'))->withAttributes(['id' => 'addItemButton', 'onclick' => 'onAddItemClick()'])->appendIcon(Icon::create('plus-sign')) !!}
                     @endif
         	    @endif
                 @if ($invoice->trashed())
@@ -1224,6 +1226,11 @@
 		$('#saveButton').html(actionLabel + "<span class='glyphicon glyphicon-globe'></span>");
     }
 
+	function onAddItemClick() {
+		model.forceShowItems(true);
+		$('#addItemButton').hide();
+	}
+
 	function onEmailClick() {
         if (!NINJA.isRegistered) {
             swal("{!! trans('texts.registration_required') !!}");
diff --git a/resources/views/invoices/edit_table.blade.php b/resources/views/invoices/edit_table.blade.php
index 344280af1499..3ff0a9bbcc09 100644
--- a/resources/views/invoices/edit_table.blade.php
+++ b/resources/views/invoices/edit_table.blade.php
@@ -1,4 +1,4 @@
-<thead  {!! $isTasks ? 'style="display:none;" data-bind="visible: $root.hasTasks"' : '' !!}>
+<thead  {!! $isTasks ? 'style="display:none;" data-bind="visible: $root.hasTasks"' : (! empty($tasks) ? 'data-bind="visible: $root.hasItems"' : '') !!}>
     @if ($isTasks)
         <tr><td style="20px" colspan="20"></td></tr>
     @endif
@@ -19,7 +19,7 @@
         <th style="min-width:32px;" class="hide-border"></th>
     </tr>
 </thead>
-<tbody data-bind="sortable: { data: invoice_items_{{ $isTasks ? 'with_tasks' : 'without_tasks' }}, allowDrop: false, afterMove: onDragged} {{ $isTasks ? ', visible: $root.hasTasks' : '' }}"
+<tbody data-bind="sortable: { data: invoice_items_{{ $isTasks ? 'with_tasks' : 'without_tasks' }}, allowDrop: false, afterMove: onDragged} {{ $isTasks ? ', visible: $root.hasTasks' : (! empty($tasks) ? ', visible: $root.hasItems' : '') }}"
     {!! $isTasks ? 'style="display:none;border-spacing: 100px"' : '' !!}>
     <tr data-bind="event: { mouseover: showActions, mouseout: hideActions }" class="sortable-row">
         <td class="hide-border td-icon">
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index 8a9bdddca3a9..3e1b6ab310b8 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -173,7 +173,7 @@ function ViewModel(data) {
         }
         invoice = self.invoice();
         for (var i=0; i<invoice.invoice_items_with_tasks().length; ++i) {
-            var item = invoice.invoice_items()[i];
+            var item = invoice.invoice_items_with_tasks()[i];
             if (! item.isEmpty()) {
                 self.hasTasksCached = true;
                 return true;
@@ -181,6 +181,26 @@ function ViewModel(data) {
         }
         return false;
     });
+
+    self.hasItemsCached = false;
+    self.forceShowItems = ko.observable(false);
+    self.hasItems = ko.computed(function() {
+        if (self.forceShowItems()) {
+            return true;
+        }
+        if (self.hasItemsCached) {
+            return true;
+        }
+        invoice = self.invoice();
+        for (var i=0; i<invoice.invoice_items_without_tasks().length; ++i) {
+            var item = invoice.invoice_items_without_tasks()[i];
+            if (! item.isEmpty()) {
+                self.hasItemsCached = true;
+                return true;
+            }
+        }
+        return false;
+    });
 }
 
 function InvoiceModel(data) {