diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index 40e13e5b81f6..c0ac3e488300 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -219,7 +219,7 @@
 
             <!-- Task List -->
             <div id="taskList" class="list-group col-sm-5 col-sm-pull-7" style="display:none">
-				<div id="filterPanel" style="margin-bottom:0px;padding-top:20px;padding-bottom:0px;padding-left:10px;displayx:none;">
+				<div id="filterPanel" style="margin-bottom:0px;padding-top:20px;padding-bottom:0px;padding-left:10px;display:none;">
 				<div class="panel panel-default">
 					<div class="panel-body">
 						<div class="row" xstyle="padding-bottom:22px;">
diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php
index 88ff5eea0208..a99aeaa3a80c 100644
--- a/resources/views/tasks/time_tracker_knockout.blade.php
+++ b/resources/views/tasks/time_tracker_knockout.blade.php
@@ -400,8 +400,11 @@
             if (task) {
                 task.focus();
                 if (! task.project()) {
+                    // trigger client change to show all projects in autocomplete
                     $('select#client_id').trigger('change');
                 }
+            } else {
+                $('#search').focus();
             }
 
             if (isStorageSupported()) {