diff --git a/app/assets/javascripts/environments/components/environment_actions.js b/app/assets/javascripts/environments/components/environment_actions.js
index 1f325d66e87..313e78e573a 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js
+++ b/app/assets/javascripts/environments/components/environment_actions.js
@@ -35,7 +35,7 @@ export default {
     onClickAction(endpoint) {
       this.isLoading = true;
 
-      $(this.$el.querySelector('.has-tooltip')).tooltip('destroy');
+      $(this.$refs.tooltip).tooltip('destroy');
 
       this.service.postAction(endpoint)
       .then(() => {
@@ -64,6 +64,7 @@ export default {
         class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container has-tooltip"
         data-container="body"
         data-toggle="dropdown"
+        ref="tooltip"
         :title="title"
         :aria-label="title"
         :disabled="isLoading">
diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.js b/app/assets/javascripts/pipelines/components/pipelines_actions.js
index 535064f610e..ffda18d2e0f 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_actions.js
+++ b/app/assets/javascripts/pipelines/components/pipelines_actions.js
@@ -28,7 +28,7 @@ export default {
     onClickAction(endpoint) {
       this.isLoading = true;
 
-      $(this.$el.querySelector('.has-tooltip')).tooltip('destroy');
+      $(this.$refs.tooltip).tooltip('destroy');
 
       this.service.postAction(endpoint)
       .then(() => {
@@ -59,6 +59,7 @@ export default {
         data-toggle="dropdown"
         data-placement="top"
         aria-label="Manual job"
+        ref="tooltip"
         :disabled="isLoading">
         ${playIconSvg}
         <i