4 files changed, 13 insertions, 2 deletions
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 89ab77432..c426b4d23 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -1,7 +1,7 @@
 [% PROCESS 'admin/report_blocks.html'; # For the report state dropdown %]
 [% permissions = c.user.permissions(c, problem.bodies_str) %]
 [% second_column = BLOCK -%]
-  <div id="side-report-secondary">
+  <div id="side-inspect">
     [% INCLUDE 'errors.html' %]
 
     <form id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id, 'inspect' ) %]">
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index 049b24d7d..b24158f09 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -129,7 +129,7 @@
         <a class="btn" id="moderate-report" role="menuitem" aria-label="[% loc('Moderate this report') %]">[% loc('Moderate') %]</a>
       [% END %]
       [% IF !hide_inspect_button AND permissions.keys.grep('report_inspect|report_edit_category|report_edit_priority').size %]
-        <a class="btn" href="/report/[% problem.id %]/inspect" role="menuitem">
+        <a class="btn" href="/report/[% problem.id %]/inspect#side-inspect" role="menuitem">
           [%~ IF permissions.report_inspect ~%]
             [%~ loc('Inspect') ~%]
           [%~ ELSE ~%]
diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html
index fb8cd8191..1ee5c4636 100644
--- a/templates/web/base/report/display.html
+++ b/templates/web/base/report/display.html
@@ -14,6 +14,11 @@
 </div>
 
 <div id="map_sidebar">
+
+[% IF two_column_sidebar %]
+  <div class="two_column_sidebar">
+[% END %]
+
   <div id="side-report">
 
 [% IF login_success %]
@@ -47,6 +52,11 @@
   </div>
 
   [% second_column %]
+
+[% IF two_column_sidebar %]
+  </div>
+[% END %]
+
 </div>
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/report/inspect.html b/templates/web/base/report/inspect.html
index 0a3fdcbb2..f4a9e4c46 100644
--- a/templates/web/base/report/inspect.html
+++ b/templates/web/base/report/inspect.html
@@ -1,5 +1,6 @@
 [%
   SET bodyclass = 'mappage with-actions';
+  SET two_column_sidebar = 1;
   PROCESS 'report/_inspect.html';
   SET shown_form = 1 UNLESS problem.get_extra_metadata('inspected');
   INCLUDE 'report/display.html', hide_inspect_button = 1;