diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
index 6e91517b49..836781bbaf 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
@@ -33,6 +33,8 @@
                    (onError)='onErrorEmitter($event)'
                    (executeOutcome)='executeOutcomeEmitter($event)'
                    #activitiForm>
-
     </activiti-form>
+    <button type="button" class="mdl-button" *ngIf="!hasFormKey() && isTaskActive()" (click)="onComplete()">
+        {{ 'TASK_DETAILS.BUTTON.COMPLETE' | translate }}
+    </button>
 </div>
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
index c6449a6149..0a91e5df91 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
@@ -133,6 +133,10 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
             && this.taskDetails.formKey !== 'null';
     }
 
+    isTaskActive() {
+        return this.taskDetails && this.taskDetails.duration === null;
+    }
+
     /**
      * Load the activiti task details
      * @param taskId
@@ -176,6 +180,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
         this.activitiTaskList.completeTask(this.taskId).subscribe(
             (res) => {
                 console.log(res);
+                this.formCompleted.emit(res);
             }
         );
     }
diff --git a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json
index 8d559cac14..f55ebd1fb9 100644
--- a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json
+++ b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json
@@ -13,6 +13,9 @@
       "COMMENTS": "Comments",
       "CHECKLIST": "Checklist"
     },
+    "BUTTON": {
+      "COMPLETE": "Complete"
+    },
     "MESSAGES": {
       "NONE": "No task details found."
     },