diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index c93599f7f3a..77583536a4f 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -139,7 +139,7 @@ export class GrafanaCtrl {
   }
 }
 
-export function grafanaAppDirective() {
+export function grafanaAppDirective(playlistSrv) {
   return {
     restrict: 'E',
     controller: GrafanaCtrl,
@@ -170,6 +170,10 @@ export function grafanaAppDirective() {
           return;
         }
 
+        if (target.parents('.dash-playlist-actions').length === 0) {
+            playlistSrv.stop();
+        }
+
         // hide search
         if (elem.find('.search-container').length > 0) {
           if (target.parents('.search-container').length === 0) {