diff --git a/app/views/additional_tags/settings/_general.html.slim b/app/views/additional_tags/settings/_general.html.slim
index 92e4a6b..bac0b28 100644
--- a/app/views/additional_tags/settings/_general.html.slim
+++ b/app/views/additional_tags/settings/_general.html.slim
@@ -37,6 +37,9 @@ fieldset.settings
   p
     = additionals_settings_checkbox :active_issue_tags
 
+  p
+    = additionals_settings_checkbox :show_tags_after_queries
+
   p
     = additionals_settings_checkbox :open_issues_only
 
diff --git a/app/views/issues/_tags_sidebar_after.html.slim b/app/views/issues/_tags_sidebar_after.html.slim
new file mode 100644
index 0000000..5f81e1d
--- /dev/null
+++ b/app/views/issues/_tags_sidebar_after.html.slim
@@ -0,0 +1,2 @@
+- if AdditionalTags.setting? :show_tags_after_queries
+  == render 'tags_sidebar'
diff --git a/app/views/issues/_tags_sidebar_before.html.slim b/app/views/issues/_tags_sidebar_before.html.slim
new file mode 100644
index 0000000..514cb3f
--- /dev/null
+++ b/app/views/issues/_tags_sidebar_before.html.slim
@@ -0,0 +1,2 @@
+- unless AdditionalTags.setting? :show_tags_after_queries
+  == render 'tags_sidebar'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9509092..a81d7a5 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -15,6 +15,7 @@ en:
   label_manage_tags: "Manage tags"
   label_merge_selected_tags: "Merge selected tags"
   label_open_issues_only: "Display open issues only"
+  label_show_tags_after_queries: "Show tags after queries"
   label_show_with_count: "Display amount on tag"
   label_tag_color_theme: Color theme %{value}
   label_tags_color_theme: Color
diff --git a/config/settings.yml b/config/settings.yml
index e9eb9c7..17287de 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,6 +1,7 @@
 active_issue_tags: '0'
 active_wiki_tags: '0'
 open_issues_only: '0'
+show_tags_after_queries: '0'
 show_with_count: '0'
 tags_color_theme: '1'
 tags_sidebar: 'none'
diff --git a/lib/additional_tags/hooks/view_hook.rb b/lib/additional_tags/hooks/view_hook.rb
index b432071..d74c6e6 100644
--- a/lib/additional_tags/hooks/view_hook.rb
+++ b/lib/additional_tags/hooks/view_hook.rb
@@ -11,7 +11,8 @@ class ViewHook < Redmine::Hook::ViewListener
                 partial: 'issues/tags_form_details',
                 locals: { tags_form: 'issues/tags_form' }
       render_on :view_issues_show_details_bottom, partial: 'issues/tags'
-      render_on :view_issues_sidebar_planning_bottom, partial: 'issues/tags_sidebar'
+      render_on :view_issues_sidebar_planning_bottom, partial: 'issues/tags_sidebar_before'
+      render_on :view_issues_sidebar_queries_bottom, partial: 'issues/tags_sidebar_after'
       render_on :view_layouts_base_html_head, partial: 'additional_tags/html_head'
       render_on :view_layouts_base_body_bottom, partial: 'additional_tags/body_bottom'
       render_on :view_wiki_form_bottom, partial: 'tags_form_bottom'