diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 6618c58d..9890ed0e 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -47,8 +47,9 @@ class PagesController < ApplicationController
    end
    
    def show_from_link
-      url = "/#{@item.path}?id=#{params[:id]}"
+      url = "/#{@item.path}"
       options = ''
+      options << "#{options.blank? ? '?' : '&'}id=#{params[:id]}" unless params[:id].blank?
       options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
       options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
       options << "#{options.blank? ? '?' : '&'}preview=#{params[:preview]}" unless params[:preview].blank?