diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php
index cde0797d0f71..2142c7470fec 100644
--- a/resources/views/tasks/edit.blade.php
+++ b/resources/views/tasks/edit.blade.php
@@ -41,7 +41,7 @@
         {!! Former::text('time_log') !!}
     </div>
 
-    <div class="row">
+    <div class="row" onkeypress="formEnterClick(event)">
         <div class="col-md-12">
 
             <div class="panel panel-default">
@@ -490,6 +490,20 @@
         }
     }
 
+    function formEnterClick(event) {
+        if (event.keyCode === 13){
+            if (event.target.type == 'textarea') {
+                return;
+            }
+            event.preventDefault();
+            @if ($task && $task->trashed())
+                return;
+            @endif
+            submitAction('');
+            return false;
+        }
+    }
+
     $(function() {
         $('input[type=radio]').change(function() {
             onTaskTypeChange();