diff --git a/HELP.md b/HELP.md
index 8e35d5de..34803e5d 100644
--- a/HELP.md
+++ b/HELP.md
@@ -329,6 +329,7 @@ Here is description of options:
 
 Some config options can be overridden with `environment variables` such:
 
+- `CLOUDCMD_EDITOR` - set editor
 - `CLOUDCMD_TERMINAL` - enable terminal
 - `CLOUDCMD_TERMINAL_PATH` - set terminal path
 - `CLOUDCMD_CONFIG_DIALOG` - enable config dialog
diff --git a/app.json b/app.json
index b7ad6788..f996a438 100644
--- a/app.json
+++ b/app.json
@@ -17,6 +17,11 @@
           "value": "false",
           "required": false
       },
+      "CLOUDCMD_EDITOR": {
+          "description": "set editor",
+          "value": "edward",
+          "required": false
+      },
       "CLOUDCMD_TERMINAL": {
           "description": "enable terminal",
           "value": "true",
diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js
index d8a2dba3..4a04918f 100755
--- a/bin/cloudcmd.js
+++ b/bin/cloudcmd.js
@@ -51,7 +51,7 @@ const args = require('minimist')(argv.slice(2), {
         minify      : config('minify'),
         online      : config('online'),
         open        : config('open'),
-        editor      : config('editor') || 'edward',
+        editor      : choose(env('editor'), config('editor')) || 'edward',
         packer      : config('packer') || 'tar',
         zip         : config('zip'),
         username    : config('username'),