diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 079a4e822..215df8e10 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -193,12 +193,14 @@ class AttachmentsController < ApplicationController
         else
           format.html { redirect_to_referer_or course_path(@course) }
         end
+      elsif !@attachment.container.nil? && @attachment.container.is_a?(Softapplication)
+        format.html { redirect_to_referer_or softapplications_path(@attachment.container) }
       else
-        # if @project.nil?
-        #   format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
-        # else
+         if @project.nil?
+           format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
+         else
           format.html { redirect_to_referer_or project_path(@project) }
-        # end
+         end
       end
 
       format.js