diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
index 276058eeaf..a215a10cf8 100644
--- a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
+++ b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
@@ -165,19 +165,6 @@
                 });
         }
 
-        vm.debugInServiceInsight = function (index) {
-            var messageId = vm.failedMessages[index].message_id;
-            var dnsName = scConfig.service_control_url.toLowerCase();
-
-            if (dnsName.indexOf("https") === 0) {
-                dnsName = dnsName.replace("https://", "");
-            } else {
-                dnsName = dnsName.replace("http://", "");
-            }
-
-            $window.open("si://" + dnsName + "?search=" + messageId);
-        };
-
         var selectGroupInternal = function (group, sort, direction, changeToMessagesTab) {
             if ($scope.loadingData) {
                 return;
diff --git a/src/ServicePulse.Host/app/js/views/message/controller.js b/src/ServicePulse.Host/app/js/views/message/controller.js
index f4b4fc876e..167fddff23 100644
--- a/src/ServicePulse.Host/app/js/views/message/controller.js
+++ b/src/ServicePulse.Host/app/js/views/message/controller.js
@@ -6,6 +6,7 @@
         $scope,
         $routeParams,
         $moment,
+        $window,
         scConfig,
         toastService,
         serviceControlService,
@@ -134,6 +135,7 @@
         "$scope",
         "$routeParams",
         "$moment",
+        "$window",
         "scConfig",
         "toastService",
         "serviceControlService",
diff --git a/src/ServicePulse.Host/app/js/views/message/messages-view.html b/src/ServicePulse.Host/app/js/views/message/messages-view.html
index 8550cb570d..f9d438ce7b 100644
--- a/src/ServicePulse.Host/app/js/views/message/messages-view.html
+++ b/src/ServicePulse.Host/app/js/views/message/messages-view.html
@@ -39,7 +39,7 @@
                         <button type="button" ng-hide="vm.message.archived" ng-disabled="vm.message.retried || vm.message.resolved" class="btn btn-default" confirm-title="Are you sure you want to archive this message?" confirm-message="If you archive, this message won't be available for retrying unless it is later unarchived." confirm-click="vm.archiveMessage()"><i class="fa fa-archive"></i> Archive message</button>
                         <button type="button" ng-hide="!vm.message.archived" class="btn btn-default" confirm-title="Are you sure you want to un-archive this message?" confirm-message="Unarchived message will be moved back to the list of failed messages." confirm-click="vm.unarchiveMessage()"><i class="fa fa-undo"></i> Unarchive</button>
                         <button type="button" ng-disabled="vm.message.retried || vm.message.archived || vm.message.resolved" class="btn btn-default" confirm-title="Are you sure you want to retry this message?" confirm-message="Are you sure you want to retry this message?" confirm-click="vm.retryMessage()"><i class="fa fa-refresh"></i> Retry message</button>
-                        <button type="button" class="btn btn-default" ng-click="debugInServiceInsight($index)"><img src="img/si-icon.svg"> View in ServiceInsight</button>
+                        <button type="button" class="btn btn-default" ng-click="vm.debugInServiceInsight($index)"><img src="img/si-icon.svg"> View in ServiceInsight</button>
                     </div>
                 </div>
             </div>
diff --git a/src/ServicePulse.Host/app/js/views/pending_retries/controller.js b/src/ServicePulse.Host/app/js/views/pending_retries/controller.js
index 92f74cee0b..1b7bc9ff44 100644
--- a/src/ServicePulse.Host/app/js/views/pending_retries/controller.js
+++ b/src/ServicePulse.Host/app/js/views/pending_retries/controller.js
@@ -299,19 +299,6 @@
             vm.loadMoreResults();
         };
 
-        vm.debugInServiceInsight = function(index) {
-            var messageId = vm.pendingRetryMessages[index].message_id;
-            var dnsName = scConfig.service_control_url.toLowerCase();
-
-            if (dnsName.indexOf("https") === 0) {
-                dnsName = dnsName.replace("https://", "");
-            } else {
-                dnsName = dnsName.replace("http://", "");
-            }
-
-            $window.open("si://" + dnsName + "?search=" + messageId);
-        };
-
         var selectGroupInternal = function(sort, direction) {
             if ($scope.loadingData) {
                 return;