diff --git a/README.md b/README.md
index 74dd363..4cd6a4a 100644
--- a/README.md
+++ b/README.md
@@ -1,84 +1,84 @@
 writeas-cli
 ===========
 ![MIT license](https://img.shields.io/github/license/writeas/writeas-cli.svg) [![Public Slack discussion](http://slack.write.as/badge.svg)](http://slack.write.as/)
 
 Command line interface for [Write.as](https://write.as) and [Write.as on Tor](http://writeas7pm7rcdqg.onion/). Works on Windows, OS X, and Linux.
 
 Like the [Android app](https://play.google.com/store/apps/details?id=com.abunchtell.writeas), the command line client keeps track of the posts you make, so future editing / deleting is easier than [doing it with cURL](http://cmd.write.as/). The goal is for this to serve as the backend for any future GUI app we build for the desktop.
 
 It is currently **alpha**, so a) functionality is basic and b) everything is subject to change — i.e., watch the [changelog](https://write.as/changelog-cli.html).
 
 ## Download
 [![Latest release](https://img.shields.io/github/release/writeas/writeas-cli.svg)](https://github.com/writeas/writeas-cli/releases/latest) ![Total downloads](https://img.shields.io/github/downloads/writeas/writeas-cli/total.svg) 
 
 Get the latest version for your operating system as a standalone executable.
 
 **Windows**: [64-bit](https://github.com/writeas/writeas-cli/releases/download/v0.4/writeas_0.4_windows_amd64.zip) – [32-bit](https://github.com/writeas/writeas-cli/releases/download/v0.4/writeas_0.4_windows_386.zip)
 
 **OS X**: [64-bit](https://github.com/writeas/writeas-cli/releases/download/v0.4/writeas_0.4_darwin_amd64.zip) – [32-bit](https://github.com/writeas/writeas-cli/releases/download/v0.4/writeas_0.4_darwin_386.zip)
 
 **Linux**: [64-bit](https://github.com/writeas/writeas-cli/releases/download/v0.4/writeas_0.4_linux_amd64.tar.gz) – [32-bit](https://github.com/writeas/writeas-cli/releases/download/v0.4/writeas_0.4_linux_386.tar.gz)
 
 ### Go get it
 `go get github.com/writeas/writeas-cli/writeas`
 
 ## Usage
 
 ```
 writeas [global options] command [command options] [arguments...]
 
 COMMANDS:
    post     Alias for default action: create post from stdin
    new      Compose a new post from the command-line and publish
    delete   Delete a post
    update   Update (overwrite) a post
    get      Read a raw post
    add      Add an existing post locally
    list     List local posts
    help, h  Shows a list of commands or help for one command
    
 GLOBAL OPTIONS:
    --tor, -t		 Perform action on Tor hidden service
    --tor-port "9150" Use a different port to connect to Tor
    --help, -h		 show help
    --version, -v	 print the version
 ```
 
 ### Examples
 
 These are a few common uses for `writeas`. If you get stuck or want to know more, run `writeas [command] --help`. If you still have questions, [ask us](https://write.as/contact).
 
 #### Share something
 
 Without any flags, `writeas` creates a post with a `monospace` typeface that doesn't word wrap (scrolls horizontally):
 
 ```bash
 $ echo "Hello world!" | writeas
 Posting...
 Copied to clipboard.
 https://write.as/aaaaaaaaaaaa
 ```
 
 This is generally more useful for posting terminal output or code, like so (the `--code` flag turns on syntax highlighting):
 
 OS X / *nix: `cat writeas/cli.go | writeas --code`
 
 Windows: `type writeas/cli.go | writeas.exe --code`
 
 #### Composing posts
 
 If you simply have a penchant for never leaving your keyboard, `writeas` is great for composing new posts from the command-line. Just use the `new` subcommand.
 
-`writeas new` will open your favorite command-line editor, as specified by your `EDITOR` environment variable, falling back to `vim` on OS X / *nix.
+`writeas new` will open your favorite command-line editor, as specified by your `WRITEAS_EDITOR` or `EDITOR` environment variables (in that order), falling back to `vim` on OS X / *nix.
 
 Customize your post's appearance with the `--font` flag:
 
 | Argument | Appearance (Typeface) | Word Wrap? |
 | -------- | --------------------- | ---------- |
 | `sans` | Sans-serif (Open Sans) | Yes |
 | `serif` | Serif (Lora) | Yes |
 | `wrap` | Monospace | Yes |
 | `mono` | Monospace | No |
 | `code` | Syntax-highlighted monospace | No |
 
 Put it all together, e.g. publish with a sans-serif font: `writeas new --font sans`
diff --git a/writeas/edit.go b/writeas/edit.go
new file mode 100644
index 0000000..fdf72b7
--- /dev/null
+++ b/writeas/edit.go
@@ -0,0 +1,16 @@
+package main
+
+import (
+	"os"
+)
+
+var editors = []string{"WRITEAS_EDITOR", "EDITOR"}
+
+func getConfiguredEditor() string {
+	for _, v := range editors {
+		if e := os.Getenv(v); e != "" {
+			return e
+		}
+	}
+	return ""
+}
diff --git a/writeas/posts_nix.go b/writeas/posts_nix.go
index ab668d9..ee4d78b 100644
--- a/writeas/posts_nix.go
+++ b/writeas/posts_nix.go
@@ -1,44 +1,43 @@
 // +build !windows
 
 package main
 
 import (
 	"fmt"
 	"github.com/mitchellh/go-homedir"
-	"os"
 	"os/exec"
 )
 
 const (
 	dataDirName = ".writeas"
 	noEditorErr = "Couldn't find default editor. Try setting $EDITOR environment variable in ~/.profile"
 )
 
 func parentDataDir() string {
 	dir, err := homedir.Dir()
 	if err != nil {
 		panic(err)
 	}
 
 	return dir
 }
 
 func editPostCmd(fname string) *exec.Cmd {
-	editor := os.Getenv("EDITOR")
+	editor := getConfiguredEditor()
 	if editor == "" {
 		// Fall back to default editor
 		path, err := exec.LookPath("vim")
 		if err != nil {
 			path, err = exec.LookPath("nano")
 			if err != nil {
 				return nil
 			}
 		}
 		editor = path
 	}
 	return exec.Command(editor, fname)
 }
 
 func messageRetryCompose(fname string) string {
 	return fmt.Sprintf("To retry this post, run:\n  cat %s | writeas", fname)
 }