diff --git a/app/site_files.rb b/app/site_files.rb
index 02738b95..6601c222 100644
--- a/app/site_files.rb
+++ b/app/site_files.rb
@@ -75,22 +75,33 @@ post '/site_files/create' do
 end
 
 def file_upload_response(error=nil)
-  http_error_code = 406
   flash[:error] = error if error
 
   if params[:from_button]
     query_string = params[:dir] ? "?"+Rack::Utils.build_query(dir: params[:dir]) : ''
     redirect "/dashboard#{query_string}"
   else
-    halt http_error_code, error if error
+    halt 406, error if error
     halt 200, 'File(s) successfully uploaded.'
   end
 end
 
 post '/site_files/upload' do
-  require_login
+  if params[:filename]
+    require_login_ajax
+    tempfile = Tempfile.new 'neocities_saving_file'
+
+    input = request.body.read
+    tempfile.set_encoding input.encoding
+    tempfile.write input
+    tempfile.close
+
+    params[:files] = [{filename: params[:filename], tempfile: tempfile}]
+  else
+    require_login
+  end
+
   @errors = []
-  http_error_code = 406
 
   if params[:files].nil?
     file_upload_response "Uploaded files were not seen by the server, cancelled. We don't know what's causing this yet. Please contact us so we can help fix it. Thanks!"
@@ -123,11 +134,11 @@ post '/site_files/upload' do
   uploaded_size = params[:files].collect {|f| f[:tempfile].size}.inject{|sum,x| sum + x }
 
   if current_site.file_size_too_large? uploaded_size
-    file_upload_response "File(s) do not fit in your available space, upload cancelled."
+    file_upload_response "File(s) do not fit in your available free space, upload cancelled."
   end
 
   if current_site.too_many_files? params[:files].length
-    file_upload_response "Too many files, cannot upload"
+    file_upload_response "Your site has exceeded the maximum number of files, please delete some files first."
   end
 
   results = current_site.store_files params[:files]
@@ -195,26 +206,6 @@ get %r{\/site_files\/text_editor\/(.+)} do
   erb :'site_files/text_editor'
 end
 
-post %r{\/site_files\/save\/(.+)} do
-  require_login_ajax
-  filename = params[:captures].first
-
-  tempfile = Tempfile.new 'neocities_saving_file'
-
-  input = request.body.read
-  tempfile.set_encoding input.encoding
-  tempfile.write input
-  tempfile.close
-
-  if current_site.file_size_too_large? tempfile.size
-    halt 'File is too large to fit in your space, it has NOT been saved. You will need to reduce the size or upgrade to a new plan.'
-  end
-
-  current_site.store_files [{filename: filename, tempfile: tempfile}]
-
-  'ok'
-end
-
 get '/site_files/allowed_types' do
   erb :'site_files/allowed_types'
 end
diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb
index 0d2100e4..f95300d6 100644
--- a/views/site_files/text_editor.erb
+++ b/views/site_files/text_editor.erb
@@ -120,16 +120,20 @@
     if(unsavedChanges == false)
       return
     $.ajax({
-      url: "/site_files/save/<%= Addressable::URI.encode @filename %>?csrf_token=<%= Rack::Utils.escape csrf_token %>",
+      url: "/site_files/upload?csrf_token=<%= Rack::Utils.escape csrf_token %>&filename=<%= Rack::Utils.escape @filename %>",
       data: editor.getValue(),
       processData: false,
       contentType: false,
       type: 'POST',
       error: function(jqXHR, textStatus, errorThrown) {
-        alert('There has been an error saving your file, please try again. If it continues to fail, make a copy of the file locally so you don\'t lose your changes!')
+        $('#saveButton').tooltip('show')
+        $('#editorUpdates span').text('There has been an error saving your file, please try again. If it continues to fail, make a copy of the file locally so you don\'t lose your changes!')
+        $('#editorUpdates').fadeIn()
+        $('#editorUpdates').removeClass('hidden')
       },
-      success: function(response){
-        if(response == 'ok') {
+      success: function(response, textStatus, xhr){
+        console.log(xhr.status)
+        if(xhr.status == 200) {
           unsavedChanges = false
           if(quit === true) {
             window.location = '/dashboard'