diff --git a/src/app.coffee b/src/app.coffee
index c49ccdf84..e122f99c0 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -5,6 +5,7 @@ Plugins = require 'plugins'
 module.exports =
 class App
   @windows: []
+  
   @root: OSX.NSBundle.mainBundle.resourcePath
 
   @activeWindow: null
@@ -13,8 +14,8 @@ class App
     @setActiveWindow new Window controller : WindowController
 
     # Move this someone more approriate
-    if localStorage.lastOpenedFilename
-      @activeWindow.open(localStorage.lastOpenedFilename)
+    if localStorage.lastOpenedPath
+      @activeWindow.open localStorage.lastOpenedPath
 
     Plugins.load()
     @activeWindow.document.ace._emit "loaded"
diff --git a/src/editor.coffee b/src/editor.coffee
index 8e2682718..37698c24b 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -57,11 +57,12 @@ class Editor extends Pane
 
   save: ->
     return @saveAs() if not @filename
-
+    
     @removeTrailingWhitespace()
     File.write @filename, @code()
     @sessions[@filename] = @ace.getSession()
-    .setDirty false
+    App = require 'app' # Get rid of this!
+    App.activeWindow.setDirty false
     @ace._emit 'save', { @filename }
 
   open: (path) ->
@@ -93,6 +94,7 @@ class Editor extends Pane
   saveAs: ->
     if file = Chrome.savePanel()
       @filename = file
+      App = require 'app' # Get rid of this!
       App.activeWindow.setTitle _.last @filename.split '/'
       @save()