diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index 76106246d..09b0230ee 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -10,11 +10,13 @@
       onFinish: function(event, total){
         $("#add_photo_button .button").html( "Add Photos" );
         $("#add_photo_loader").fadeOut(400);
+        pane_toggler_button("photo");
       },
       onStart: function(event, total){
         $("#add_photo_pane").fadeOut(400);
         $("#add_photo_button .button").html( "Uploading Photos" );
         $("#add_photo_loader").fadeIn(400);
+        $("#add_photo_button").unbind();
         return true;
       }
     });
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 399521156..994d77872 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -81,17 +81,7 @@ $(document).ready(function(){
   });
 
   //buttons//////
-  function pane_toggler_button( name ) {
-    $("#add_" + name + "_button").toggle(
-    function(evt){
-      evt.preventDefault();
-      $("#add_" + name + "_pane").fadeIn(300);
-    },function(evt){
-      evt.preventDefault();
-      $("#add_" + name +"_pane").fadeOut(200);
-    }
-  );
-  }
+
 
   pane_toggler_button("album");
   pane_toggler_button("group");
@@ -113,3 +103,16 @@ $(document).ready(function(){
   });
 
 });//end document ready
+
+
+function pane_toggler_button( name ) {
+    $("#add_" + name + "_button").toggle(
+    function(evt){
+      evt.preventDefault();
+      $("#add_" + name + "_pane").fadeIn(300);
+    },function(evt){
+      evt.preventDefault();
+      $("#add_" + name +"_pane").fadeOut(200);
+    }
+  );
+}