diff --git a/app/assets/javascripts/post_mode_menu.js b/app/assets/javascripts/post_mode_menu.js
index 526e74f6b..e10b9037f 100644
--- a/app/assets/javascripts/post_mode_menu.js
+++ b/app/assets/javascripts/post_mode_menu.js
@@ -47,9 +47,7 @@
     var s = $("#mode-box select").val();
     var post_id = $(e.target).closest("article").data("id");
     
-    if (s === "view") {
-      return;
-    } else if (s === "add-fav") {
+    if (s === "add-fav") {
       Danbooru.Favorite.create(post_id);
     } else if (s === "remove-fav") {
       Danbooru.Favorite.destroy(post_id);
@@ -72,6 +70,8 @@
     } else if (s === "apply-tag-script") {
       var tag_script = Danbooru.Cookie.get("tag-script");
       Danbooru.TagScript.run(post_id, tag_script);
+    } else {
+      return;
     }
     
     e.preventDefault();
diff --git a/app/models/upload.rb b/app/models/upload.rb
index e76e74003..bf5e8004a 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -282,6 +282,10 @@ class Upload < ActiveRecord::Base
       status == "pending"
     end
     
+    def is_processing?
+      status == "processing"
+    end
+    
     def is_completed?
       status == "completed"
     end
diff --git a/app/views/uploads/show.html.erb b/app/views/uploads/show.html.erb
index 589fad3f1..e761d92e2 100644
--- a/app/views/uploads/show.html.erb
+++ b/app/views/uploads/show.html.erb
@@ -10,6 +10,8 @@
   <p>This upload has finished processing. <%= link_to "View the post", post_path(@upload.post_id) %>.</p>
 <% elsif @upload.is_pending? %>
   <p>This upload is waiting to be processed. Please wait a few seconds.</p>
+<% elsif @upload.is_processing? %>
+  <p>This upload is being processed. Please wait a few seconds.</p>
 <% else %>
   <p>An error occurred: <%= @upload.status %></p>
 <% end %>
diff --git a/config/deploy.rb b/config/deploy.rb
index e275f7737..7dc205399 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -89,17 +89,17 @@ end
 namespace :delayed_job do
   desc "Start delayed_job process"
   task :start, :roles => :app do
-    run "cd #{current_path}; script/delayed_job start #{rails_env}"
+    run "cd #{current_path}; RAILS_ENV=#{rails_env} script/delayed_job start"
   end
   
   desc "Stop delayed_job process"
   task :stop, :roles => :app do
-    run "cd #{current_path}; script/delayed_job stop #{rails_env}"
+    run "cd #{current_path}; RAILS_ENV=#{rails_env} script/delayed_job stop"
   end
   
   desc "Restart delayed_job process"
   task :restart, :roles => :app do
-    run "cd #{current_path}; script/delayed_job restart #{rails_env}"
+    run "cd #{current_path}; RAILS_ENV=#{rails_env} script/delayed_job restart"
   end
 end
 
@@ -115,3 +115,4 @@ after "deploy:stop", "delayed_job:stop"
 after "deploy:restart", "delayed_job:restart"
 before "deploy:update", "deploy:web:disable"
 after "deploy:restart", "deploy:web:enable"
+