diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 2c96584d6227..8b9ffb65b000 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2454,6 +2454,7 @@ $LANG = array(
     'filter_sort' => 'Filter/Sort',
     'no_description' => 'No Description',
     'time_tracker_login' => 'Time Tracker Login',
+    'save_or_discard' => 'Please save or discard your changes',
 
 );
 
diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index 57010aa2d495..1b0574aedd17 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -362,6 +362,15 @@
 				model.onArchiveClick();
 			});
 
+			$(window).on('beforeunload', function () {
+				if (model.selectedTask() && model.formChanged()) {
+					swal("{{ trans('texts.save_or_discard') }}");
+					return false;
+				} else {
+					return undefined;
+				}
+		    });
+
 			/*
 			$( window ).scroll(function() {
 				$('.footer').
diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php
index d99f4581e9a0..e1116341846e 100644
--- a/resources/views/tasks/time_tracker_knockout.blade.php
+++ b/resources/views/tasks/time_tracker_knockout.blade.php
@@ -266,6 +266,11 @@
         }
 
         self.selectTask = function(task) {
+            if (model.selectedTask() && model.formChanged()) {
+                swal("{{ trans('texts.save_or_discard') }}");
+                return false;
+            }
+            
             if (task == self.selectedTask()) {
                 task = false;
                 $('.search').focus();