diff --git a/local-cli/server/util/launchEditor.js b/local-cli/server/util/launchEditor.js
index dbc309f37..6e3eb7994 100644
--- a/local-cli/server/util/launchEditor.js
+++ b/local-cli/server/util/launchEditor.js
@@ -32,11 +32,13 @@ var COMMON_EDITORS = {
   '/Applications/Atom.app/Contents/MacOS/Atom': 'atom',
   '/Applications/Atom Beta.app/Contents/MacOS/Atom Beta':
     '/Applications/Atom Beta.app/Contents/MacOS/Atom Beta',
+  '/Applications/IntelliJ IDEA.app/Contents/MacOS/idea': 'idea',
   '/Applications/Sublime Text.app/Contents/MacOS/Sublime Text':
     '/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl',
   '/Applications/Sublime Text 2.app/Contents/MacOS/Sublime Text 2':
     '/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl',
   '/Applications/Visual Studio Code.app/Contents/MacOS/Electron': 'code',
+  '/Applications/WebStorm.app/Contents/MacOS/webstorm': 'webstorm',
 };
 
 function addWorkspaceToArgumentsIfExists(args, workspace) {
@@ -56,6 +58,7 @@ function getArgumentsForLineNumber(editor, fileName, lineNumber, workspace) {
     case 'Atom Beta':
     case 'subl':
     case 'sublime':
+    case 'webstorm':
     case 'wstorm':
     case 'appcode':
     case 'charm':