diff --git a/public/app/routes/GrafanaCtrl.ts b/public/app/routes/GrafanaCtrl.ts
index 70bdf49e5e4..a860ba87e6b 100644
--- a/public/app/routes/GrafanaCtrl.ts
+++ b/public/app/routes/GrafanaCtrl.ts
@@ -280,6 +280,24 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
         if (popover.length > 0 && target.parents('.graph-legend').length === 0) {
           popover.hide();
         }
+
+        // hide time picker
+        const timePickerDropDownIsOpen = elem.find('.gf-timepicker-dropdown').length > 0;
+        const targetIsInTimePickerDropDown = target.parents('.gf-timepicker-dropdown').length > 0;
+        const targetIsInTimePickerNav = target.parents('.gf-timepicker-nav').length > 0;
+        const targetIsDatePickerRowBtn = target.parents('td[id^="datepicker-"]').length > 0;
+        const targetIsDatePickerHeaderBtn = target.parents('button[id^="datepicker-"]').length > 0;
+        if (
+          timePickerDropDownIsOpen &&
+          !targetIsInTimePickerNav &&
+          !targetIsInTimePickerDropDown &&
+          !targetIsDatePickerRowBtn &&
+          !targetIsDatePickerHeaderBtn
+        ) {
+          scope.$apply(() => {
+            scope.appEvent('closeTimepicker');
+          });
+        }
       });
     },
   };