diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 00b82ff1df3..b471d57f698 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -28,7 +28,7 @@ class Projects::BlobController < Projects::ApplicationController
       redirect_to project_blob_path(@project, File.join(@ref, file_path))
     else
       flash[:alert] = result[:message]
-      render :show
+      render :new
     end
   end
 
@@ -53,7 +53,7 @@ class Projects::BlobController < Projects::ApplicationController
       redirect_to after_edit_path
     else
       flash[:alert] = result[:message]
-      render :show
+      render :edit
     end
   end
 
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 33ef6ccacf1..cef48c179b2 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -284,11 +284,11 @@ module SharedPaths
   end
 
   step 'I am on the new file page' do
-    current_path.should eq(project_new_tree_path(@project, root_ref))
+    current_path.should eq(project_create_blob_path(@project, root_ref))
   end
 
   step 'I am on the ".gitignore" edit file page' do
-    current_path.should eq(project_edit_tree_path(
+    current_path.should eq(project_edit_blob_path(
       @project, File.join(root_ref, '.gitignore')))
   end