diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index d286d74ed596..03d3ec6a93d8 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2601,6 +2601,7 @@ $LANG = array(
     'promotion_footer' => 'Your promotion will expire soon, :link to upgrade now.',
     'unable_to_delete_primary' => 'Note: to delete this company first delete all linked companies.',
     'please_register' => 'Please register your account',
+    'processing_request' => 'Processing request',
 
 );
 
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 5f24a00b0e1e..97054f466032 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -8,7 +8,7 @@
 </div>
 
 <div class="pull-left">
-	@if (in_array($entityType, [ENTITY_TASK, ENTITY_INVOICE, ENTITY_PRODUCT, ENTITY_PROJECT]))
+	@if (in_array($entityType, [ENTITY_TASK, ENTITY_EXPENSE, ENTITY_PRODUCT, ENTITY_PROJECT]))
 		@can('create', 'invoice')
 			{!! Button::primary(trans('texts.invoice'))->withAttributes(['class'=>'invoice', 'onclick' =>'submitForm_'.$entityType.'("invoice")'])->appendIcon(Icon::create('check')) !!}
 		@endcan
@@ -128,7 +128,15 @@
 
 <script type="text/javascript">
 
+	var submittedForm;
 	function submitForm_{{ $entityType }}(action, id) {
+		// prevent duplicate form submissions
+		if (submittedForm) {
+			swal("{{ trans('texts.processing_request') }}")
+			return;
+		}
+		submittedForm = true;
+
 		if (id) {
 			$('#public_id_{{ $entityType }}').val(id);
 		}