diff --git a/src/app/stories/controller/story_detail_controller.js b/src/app/stories/controller/story_detail_controller.js
index 4aa09855..7c85f2ce 100644
--- a/src/app/stories/controller/story_detail_controller.js
+++ b/src/app/stories/controller/story_detail_controller.js
@@ -639,6 +639,7 @@ angular.module('sb.story').controller('StoryDetailController',
                     mapTaskToProject(savedTask);
                 }
                 $scope.loadEvents();
+                task.title = '';
             });
         };
 
diff --git a/src/app/stories/controller/story_new_controller.js b/src/app/stories/controller/story_new_controller.js
index 25fa5061..7aea210f 100644
--- a/src/app/stories/controller/story_new_controller.js
+++ b/src/app/stories/controller/story_new_controller.js
@@ -305,6 +305,7 @@ angular.module('sb.story').controller('StoryNewController',
                 });
             }
             $scope.tasks.push(savedTask);
+            task.title = '';
         };
 
         /**
diff --git a/src/app/stories/template/detail.html b/src/app/stories/template/detail.html
index a7036bcf..787ef046 100644
--- a/src/app/stories/template/detail.html
+++ b/src/app/stories/template/detail.html
@@ -1,6 +1,7 @@
 <!--
   ~ Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
   ~ Copyright (c) 2016 Codethink Ltd.
+  ~ Copyright (c) 2019 Adam Coldrick
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License"); you may
   ~ not use this file except in compliance with the License. You may obtain
@@ -597,24 +598,19 @@
                     </a>
                     &nbsp;
                 </div>
-                <input-inline
-                        auto-focus="true"
-                        ng-model="projects[name].branches[branchName].newTask.title"
-                        enabled="isLoggedIn"
-                        on-change="updateTaskInline()"
-                        empty-prompt="Click to assign."
-                        empty-disabled-prompt="Not assigned."
-                        maxlength="255"
-                        as-inline="false"
-                        placeholder="Enter task name"
-                        />
+                <input type="text"
+                       class="form-control"
+                       focus="true"
+                       ng-model="projects[name].branches[branchName].newTask.title"
+                       maxlength="255"
+                       placeholder="Enter task name"
+                       />
             </div>
             <div class="col-xs-3">
                 <user-typeahead
                         auto-focus="false"
                         ng-model="projects[name].branches[branchName].newTask.assignee_id"
                         enabled="isLoggedIn"
-                        on-change="updateTaskInline()"
                         empty-prompt="Click to assign."
                         empty-disabled-prompt="Not assigned."
                         as-inline="false"
diff --git a/src/app/stories/template/new_page.html b/src/app/stories/template/new_page.html
index 198a76ff..a1bb4767 100644
--- a/src/app/stories/template/new_page.html
+++ b/src/app/stories/template/new_page.html
@@ -1,7 +1,7 @@
 <!--
   ~ Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
   ~ Copyright (c) 2016 Codethink Ltd.
-  ~ Copyright (c) 2017 Adam Coldrick
+  ~ Copyright (c) 2017, 2019 Adam Coldrick
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License"); you may
   ~ not use this file except in compliance with the License. You may obtain
@@ -454,24 +454,19 @@
                     </a>
                     &nbsp;
                 </div>
-                <input-inline
-                        auto-focus="true"
-                        ng-model="projects[name].branches[branchName].newTask.title"
-                        enabled="isLoggedIn"
-                        on-change="updateTaskInline()"
-                        empty-prompt="Click to assign."
-                        empty-disabled-prompt="Not assigned."
-                        maxlength="255"
-                        as-inline="false"
-                        placeholder="Enter task name"
-                        />
+                <input type="text"
+                       class="form-control"
+                       focus="true"
+                       ng-model="projects[name].branches[branchName].newTask.title"
+                       maxlength="255"
+                       placeholder="Enter task name"
+                       />
             </div>
             <div class="col-xs-3">
                 <user-typeahead
                         auto-focus="false"
                         ng-model="projects[name].branches[branchName].newTask.assignee_id"
                         enabled="isLoggedIn"
-                        on-change="updateTaskInline()"
                         empty-prompt="Click to assign."
                         empty-disabled-prompt="Not assigned."
                         as-inline="false"
diff --git a/src/theme/base/_edit_tasks.scss b/src/theme/base/_edit_tasks.scss
index e3f56a03..00e61c29 100644
--- a/src/theme/base/_edit_tasks.scss
+++ b/src/theme/base/_edit_tasks.scss
@@ -41,8 +41,9 @@
     padding-bottom : 10px;
 }
 
-input-inline, project-typeahead, user-typeahead, task-status-dropdown {
+.task-title input, input-inline, project-typeahead, user-typeahead, task-status-dropdown {
     display: inline-block;
+    width: auto;
 
     & .form-group {
         margin-bottom: 0;