diff --git a/src/editor.coffee b/src/editor.coffee
index f65ea1d43..3349ba025 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -55,7 +55,8 @@ class Editor extends Pane
   save: ->
     return @saveAs() if not @filename
 
-    File.write @filename, @code()
+    @removeTrailingWhitespace()
+    File.write @filename, @code()   
     @sessions[@filename] = @ace.getSession()
     activeWindow.setDirty false
     @ace._emit 'save', { @filename }
@@ -89,6 +90,12 @@ class Editor extends Pane
   code: ->
     @ace.getSession().getValue()
 
+  removeTrailingWhitespace: ->
+    @ace.replaceAll "",
+      needle: "[ \t]+$"
+      regExp: true
+      wrap: true
+
   resize: (timeout=1) ->
     setTimeout =>
       @ace.focus()