diff --git a/res/app/control-panes/dashboard/remote-debug/remote-debug-controller.js b/res/app/control-panes/dashboard/remote-debug/remote-debug-controller.js
index dc3798e8..e132f8dd 100644
--- a/res/app/control-panes/dashboard/remote-debug/remote-debug-controller.js
+++ b/res/app/control-panes/dashboard/remote-debug/remote-debug-controller.js
@@ -1,4 +1,4 @@
-module.exports = function RemoteDebugCtrl($scope, $timeout) {
+module.exports = function RemoteDebugCtrl($scope, $timeout, gettext) {
   function startRemoteConnect() {
     if ($scope.control) {
       $scope.control.startRemoteConnect().then(function (result) {
@@ -21,4 +21,17 @@ module.exports = function RemoteDebugCtrl($scope, $timeout) {
       }
     }, 200)
   }
+
+  $scope.$watch('platform', function (newValue) {
+    console.log('newValue', newValue)
+    if (newValue === 'native') {
+      $scope.remoteDebugTooltip =
+        gettext('Run the following on your command line to debug the device from your IDE')
+    } else {
+      $scope.remoteDebugTooltip =
+        gettext('Run the following on your command line to debug the device from your Browser')
+    }
+
+  })
+
 }
diff --git a/res/app/control-panes/dashboard/remote-debug/remote-debug.jade b/res/app/control-panes/dashboard/remote-debug/remote-debug.jade
index cf3d4e7d..627277bb 100644
--- a/res/app/control-panes/dashboard/remote-debug/remote-debug.jade
+++ b/res/app/control-panes/dashboard/remote-debug/remote-debug.jade
@@ -2,8 +2,7 @@
   .heading
     i.fa.fa-bug
     span(translate) Remote debug
-    i.fa.fa-question-circle.pull-right(tooltip='{{"Run the following on your command line to debug the device from your IDE" | translate}}', tooltip-placement='left')
+    i.fa.fa-question-circle.pull-right(tooltip='{{remoteDebugTooltip | translate}}', tooltip-placement='left')
   .widget-content.padded
     .form-inline
       textarea(readonly, rows='1', ng-model='debugCommand', msd-elastic, text-focus-select).form-control.remote-debug-textarea
-
diff --git a/res/test/e2e/control/control-spec.js b/res/test/e2e/control/control-spec.js
index 97dd2110..02d12869 100644
--- a/res/test/e2e/control/control-spec.js
+++ b/res/test/e2e/control/control-spec.js
@@ -24,7 +24,7 @@ describe('Control Page', function () {
 
     waitUrl(/control/)
 
-    browser.sleep(1000)
+    browser.sleep(500)
 
     browser.getLocationAbsUrl().then(function (newUrl) {
       expect(newUrl).toMatch(protractor.getInstance().baseUrl + 'control')
@@ -32,7 +32,7 @@ describe('Control Page', function () {
   })
 
   it('should have a kick button', function () {
-    expect(controlPage.kickDeviceButton, true)
+    expect(controlPage.kickDeviceButton.isPresent()).toBeTruthy()
   })
 
   describe('Remote Control', function () {
@@ -101,7 +101,7 @@ describe('Control Page', function () {
         navigation.goToUrl(url)
         expect(navigation.urlInput.getAttribute('value')).toBe(url)
 
-        browser.sleep(1000)
+        browser.sleep(500)
       })
 
       it('should clear the URL input', function () {