diff --git a/Cocoa/Classes/AtomWindowController.m b/Cocoa/Classes/AtomWindowController.m
index 514b016b9..e614fdaae 100644
--- a/Cocoa/Classes/AtomWindowController.m
+++ b/Cocoa/Classes/AtomWindowController.m
@@ -40,10 +40,9 @@
     [jscocoa evalJSFile:requirePath];
 
     NSURL *resourceURL = [[NSBundle mainBundle] resourceURL];
-    NSURL *htmlURL = [resourceURL URLByAppendingPathComponent:@"static"];
-    NSURL *indexURL = [htmlURL URLByAppendingPathComponent:@"index.html"];
-    NSString *html = [NSString stringWithContentsOfURL:indexURL encoding:NSUTF8StringEncoding error:nil];
-    [[webView mainFrame] loadHTMLString:html baseURL:resourceURL];
+    NSURL *indexURL = [resourceURL URLByAppendingPathComponent:@"index.html"];
+    NSURLRequest *request = [NSURLRequest requestWithURL:indexURL]; 
+    [[webView mainFrame] loadRequest:request];
   }
 }
 
diff --git a/Rakefile b/Rakefile
index 300375a14..9ec17853e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,7 +8,7 @@ task :build do
 
   dest = File.join(built_dir, contents_dir, "Resources")
 
-  %w( src docs static plugins test vendor ).each do |dir|
+  %w(index.html src docs static plugins test vendor ).each do |dir|
     rm_rf File.join(dest, dir)
     cp_r dir, File.join(dest, dir)
   end
diff --git a/static/index.html b/index.html
similarity index 100%
rename from static/index.html
rename to index.html