diff --git a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js
index 3131fdf29a..80604b21e0 100644
--- a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js
+++ b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js
@@ -180,7 +180,7 @@ define(function (require, exports, module) {
             // the active editor takes the priority in the workflow. If a css related file is active,
             // then we dont need to open the html live doc. For less files, we dont check if its related as
             // its not directly linked usually and needs a compile step. so we just do a fuzzy search.
-            activeEditor.focus();
+            _focusEditorIfNeeded(activeEditor, nodeName, contentEditable);
             _searchAndCursorIfCSS(activeEditor, allSelectors, nodeName);
             // in this case, see if we need to do any css reverse highlight magic here
         } else if(openLiveDocEditor) {
diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
index a17f0a9a3e..55f3801438 100644
--- a/src/document/DocumentCommandHandlers.js
+++ b/src/document/DocumentCommandHandlers.js
@@ -2131,7 +2131,7 @@ define(function (require, exports, module) {
                 if(nodeTerminateDueToShutdown){
                     return; // normal shutdown
                 }
-                Metrics.countEvent(Metrics.EVENT_TYPE.NODEJS, 'crash', "dlgShown");
+                Metrics.countEvent(Metrics.EVENT_TYPE.NODEJS, 'crash', Phoenix.platform);
                 window.fs.forceUseNodeWSEndpoint(false);
                 Dialogs
                     .showErrorDialog(Strings.ERROR_NODE_JS_CRASH_TITLE, Strings.ERROR_NODE_JS_CRASH_MESSAGE)
diff --git a/src/view/fontrules/font-based-rules.less b/src/view/fontrules/font-based-rules.less
index 1c701a1173..e6a16db1d5 100644
--- a/src/view/fontrules/font-based-rules.less
+++ b/src/view/fontrules/font-based-rules.less
@@ -22,8 +22,6 @@
 @defaultmenuwidth: 300px/@defaultfontsize;
 
 @lineheight: @fontsize +  @fontsize * @lineheightoffset;
-@menuFontSize: @fontsize + 2;
-@titleFontSize: @fontsize + 6;
 
 .CodeMirror {
     font-size: @fontsize !important;
@@ -34,23 +32,6 @@
     line-height: @lineheight  !important;
 }
 
-.modal-bar{
-    font-size: @menuFontSize !important;
-}
-
-.context-menu .dropdown-menu li a , .toolbar .nav .dropdown-menu li a{
-    font-size: @menuFontSize !important;
-    line-height: @lineheight  !important;
-}
-
-.toolbar .title  {
-    font-size: @titleFontSize !important;
-}
-
-#titlebar {
-    font-size: @menuFontSize !important;
-}
-
 span.brackets-js-hints-with-type-details {
     width: @defaultmenuwidth * @fontsize !important;
 }