diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index 4f2a831e22ad..434afb70666c 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -121,6 +121,15 @@
 			margin-bottom: 60px;
 		}
 
+		#taskList {
+			position: fixed;
+		}
+
+		#taskForm {
+			overflow: visible;
+		}
+
+
 		.times-table td {
 			xmargin: 0px !important;
 			xpadding: 0px !important;
@@ -194,7 +203,7 @@
         <div class="row no-gutter">
 
             <!-- Task Form -->
-            <div class="col-sm-7 col-sm-push-5">
+            <div id="taskForm" class="col-sm-7 col-sm-push-5">
                 <div id="formDiv" class="panel panel-default x-affix" data-bind="visible: selectedTask" style="margin:20px; display:none;">
                     <div class="panel-body">
 						<form id="taskForm">
@@ -294,7 +303,7 @@
             </div>
 
             <!-- Task List -->
-            <div id="taskList" class="list-group col-sm-5 col-sm-pull-7" style="display:none">
+            <div id="taskList" class="list-group col-sm-5 col-sm-pull-7" style="display:none;overflow:auto;margin-bottom:0px;">
 				<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">
@@ -610,10 +619,16 @@
 			        $('#buttons .btn').removeClass('btn-lg');
 			    }
 			}
+			function setPanelHeights() {
+				var height = $(window).height() - $('.navbar').height() - 2;
+				$('#taskList').height(height);
+			}
 			$(window).on('resize', function() {
 				setButtonSize();
+				setPanelHeights();
 			});
 			setButtonSize();
+			setPanelHeights();
 
 			$(window).on('beforeunload', function () {
 				if (model.isDesktop()) {
diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php
index b915c87e1fc7..6a2f09f9cff5 100644
--- a/resources/views/tasks/time_tracker_knockout.blade.php
+++ b/resources/views/tasks/time_tracker_knockout.blade.php
@@ -362,7 +362,6 @@
                 return false;
             }
             var project = task.project();
-            console.log(project);
             if (self.selectedProject() && self.selectedProject().public_id() == project.public_id()) {
                 self.filter('');
                 self.selectedProject(false);