diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 44154e10c..d8a30618f 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -130,14 +130,10 @@ private
         if post.errors.any?
           @error_message = post.errors.full_messages.join("; ")
           render :template => "static/error", :status => 500
-        elsif params[:tags_query].present? && params[:pool_id].present?
-          redirect_to post_path(post, :tags => params[:tags_query], :pool_id => params[:pool_id])
-        elsif params[:tags_query].present?
-          redirect_to post_path(post, :tags => params[:tags_query])
-        elsif params[:pool_id].present?
-          redirect_to post_path(post, :pool_id => params[:pool_id])
         else
-          redirect_to post_path(post)
+          response_params = {:tags => params[:tags_query], :pool_id => params[:pool_id], :favgroup_id => params[:favgroup_id]}
+          response_params.reject!{|key, value| value.blank?}
+          redirect_to post_path(post, response_params)
         end
       end
 
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index ec3f4f6b4..11b15b92b 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -9,6 +9,7 @@
 <%= form_for(post, :html => {:class => "simple_form", :id => "form"}) do |f| %>
   <%= hidden_field_tag :tags_query, params[:tags] %>
   <%= hidden_field_tag :pool_id, params[:pool_id] %>
+  <%= hidden_field_tag :favgroup_id, params[:favgroup_id] %>
   <%= f.hidden_field :old_tag_string, :value => post.tag_string %>
   <%= f.hidden_field :old_parent_id, :value => post.parent_id %>
   <%= f.hidden_field :old_source, :value => post.source %>