diff --git a/panels/applications/cc-applications-panel.ui b/panels/applications/cc-applications-panel.ui
index 387b00c3f..4cfec5176 100644
--- a/panels/applications/cc-applications-panel.ui
+++ b/panels/applications/cc-applications-panel.ui
@@ -173,239 +173,243 @@
                 <child type="top">
                   <object class="AdwHeaderBar"/>
                 </child>
-                <child type="top">
-                  <object class="AdwBanner" id="sandbox_banner">
-                    <property name="visible">False</property>
-                    <property name="revealed">True</property>
+                <property name="content">
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="CcListRowInfoButton" id="sandbox_info_button">
-                        <property name="visible" bind-source="sandbox_banner" bind-property="visible" bind-flags="sync-create|default"/>
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <property name="margin-end">3</property>
-                        <property name="text" translatable="yes">App settings cannot be fully enforced for apps which are not sandboxed. These apps may use permissions which are not shown.</property>
+                      <object class="AdwBanner" id="sandbox_banner">
+                        <property name="visible">False</property>
+                        <property name="revealed">True</property>
+                        <child>
+                          <object class="CcListRowInfoButton" id="sandbox_info_button">
+                            <property name="visible" bind-source="sandbox_banner" bind-property="visible" bind-flags="sync-create|default"/>
+                            <property name="halign">end</property>
+                            <property name="valign">center</property>
+                            <property name="margin-end">3</property>
+                            <property name="text" translatable="yes">App settings cannot be fully enforced for apps which are not sandboxed. These apps may use permissions which are not shown.</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-
-                <property name="content">
-                  <object class="AdwPreferencesPage" id="settings_box">
-                    <!-- App icon & buttons -->
                     <child>
-                      <object class="AdwPreferencesGroup">
-
+                    <object class="AdwPreferencesPage" id="settings_box">
+                        <!-- App icon & buttons -->
                         <child>
-                          <object class="GtkBox">
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">18</property>
-                            <child>
-                              <object class="GtkImage" id="app_icon_image">
-                                <property name="icon-name">org.gnome.Software</property>
-                                <property name="pixel-size">96</property>
-                                <style>
-                                  <class name="icon-dropshadow" />
-                                </style>
-                              </object>
-                            </child>
-
-                            <child>
-                              <object class="GtkLabel" id="app_name_label">
-                                <property name="wrap">True</property>
-                                <style>
-                                  <class name="title" />
-                                  <class name="title-1" />
-                                </style>
-                              </object>
-                            </child>
+                          <object class="AdwPreferencesGroup">
 
                             <child>
                               <object class="GtkBox">
-                                <property name="halign">center</property>
-                                <property name="margin-top">12</property>
-                                <property name="margin-bottom">12</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">18</property>
                                 <child>
-                                  <object class="GtkButton" id="launch_button">
-                                    <property name="label" translatable="yes">_Open</property>
-                                    <property name="use-underline">True</property>
-                                    <property name="can-shrink">True</property>
-                                    <signal name="clicked" handler="on_launch_button_clicked_cb" object="CcApplicationsPanel" swapped="yes" />
+                                  <object class="GtkImage" id="app_icon_image">
+                                    <property name="icon-name">org.gnome.Software</property>
+                                    <property name="pixel-size">96</property>
                                     <style>
-                                      <class name="pill" />
-                                      <class name="suggested-action" />
+                                      <class name="icon-dropshadow" />
                                     </style>
                                   </object>
                                 </child>
+
                                 <child>
-                                  <object class="GtkButton" id="view_details_button">
-                                    <property name="label" translatable="yes">App _Details</property>
-                                    <property name="use-underline">True</property>
-                                    <property name="can-shrink">True</property>
+                                  <object class="GtkLabel" id="app_name_label">
+                                    <property name="wrap">True</property>
                                     <style>
-                                      <class name="pill" />
+                                      <class name="title" />
+                                      <class name="title-1" />
                                     </style>
                                   </object>
                                 </child>
+
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="halign">center</property>
+                                    <property name="margin-top">12</property>
+                                    <property name="margin-bottom">12</property>
+                                    <property name="spacing">18</property>
+                                    <child>
+                                      <object class="GtkButton" id="launch_button">
+                                        <property name="label" translatable="yes">_Open</property>
+                                        <property name="use-underline">True</property>
+                                        <property name="can-shrink">True</property>
+                                        <signal name="clicked" handler="on_launch_button_clicked_cb" object="CcApplicationsPanel" swapped="yes" />
+                                        <style>
+                                          <class name="pill" />
+                                          <class name="suggested-action" />
+                                        </style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="view_details_button">
+                                        <property name="label" translatable="yes">App _Details</property>
+                                        <property name="use-underline">True</property>
+                                        <property name="can-shrink">True</property>
+                                        <style>
+                                          <class name="pill" />
+                                        </style>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+
+                          </object>
+                        </child>
+
+                        <child>
+                          <object class="AdwPreferencesGroup" id="integration_section">
+                            <property name="title" translatable="yes">Permissions</property>
+                            <child>
+                              <object class="AdwSwitchRow" id="search">
+                                <property name="title" translatable="yes">_Search</property>
+                                <property name="subtitle" translatable="yes">Receive system searches and send results</property>
+                                <property name="use-underline">True</property>
+                                <signal name="notify::active" handler="search_cb" object="CcApplicationsPanel" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="CcInfoRow" id="no_search">
+                                <property name="title" translatable="yes">_Search</property>
+                                <property name="subtitle" translatable="yes">Receive system searches and send results</property>
+                                <property name="info" translatable="yes">Disabled</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="AdwSwitchRow" id="notification">
+                                <property name="title" translatable="yes">_Notifications</property>
+                                <property name="subtitle" translatable="yes">Show system notifications</property>
+                                <property name="use-underline">True</property>
+                                <signal name="notify::active" handler="notification_cb" object="CcApplicationsPanel" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="AdwSwitchRow" id="background">
+                                <property name="title" translatable="yes">_Run in Background</property>
+                                <property name="subtitle" translatable="yes">Allow activity when the app is closed</property>
+                                <property name="use-underline">True</property>
+                                <signal name="notify::active" handler="background_cb" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="AdwSwitchRow" id="screenshot">
+                                <property name="title" translatable="yes">Scr_eenshots</property>
+                                <property name="subtitle" translatable="yes">Take pictures of the screen at any time</property>
+                                <property name="use-underline">True</property>
+                                <signal name="notify::active" handler="screenshot_cb" object="CcApplicationsPanel" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="AdwSwitchRow" id="wallpaper">
+                                <property name="title" translatable="yes">Change _Wallpaper</property>
+                                <property name="subtitle" translatable="yes">Change the desktop wallpaper.</property>
+                                <property name="use-underline">True</property>
+                                <signal name="notify::active" handler="wallpaper_cb" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="AdwSwitchRow" id="sound">
+                                <property name="title" translatable="yes">So_unds</property>
+                                <property name="subtitle" translatable="yes">Reproduce sounds.</property>
+                                <property name="use-underline">True</property>
+                                <signal name="notify::active" handler="sound_cb" object="CcApplicationsPanel" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="CcInfoRow" id="no_sound">
+                                <property name="title" translatable="yes">So_unds</property>
+                                <property name="subtitle" translatable="yes">Reproduce sounds</property>
+                                <property name="info" translatable="yes">Disabled</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="AdwSwitchRow" id="shortcuts">
+                                <property name="title" translatable="yes">_Inhibit Shortcuts</property>
+                                <property name="subtitle" translatable="yes">Block standard keyboard shortcuts</property>
+                                <property name="use-underline">True</property>
+                                <signal name="notify::active" handler="shortcuts_cb" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="AdwSwitchRow" id="camera">
+                                <property name="title" translatable="yes">Camera</property>
+                                <property name="subtitle" translatable="yes">Take pictures with the camera</property>
+                                <signal name="notify::active" handler="camera_cb" object="CcApplicationsPanel" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="CcInfoRow" id="no_camera">
+                                <property name="title" translatable="yes">C_amera</property>
+                                <property name="subtitle" translatable="yes">Take pictures with the camera</property>
+                                <property name="info" translatable="yes">Disabled</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="AdwSwitchRow" id="microphone">
+                                <property name="title" translatable="yes">_Microphone</property>
+                                <property name="subtitle" translatable="yes">Record audio with the microphone</property>
+                                <property name="use-underline">True</property>
+                                <signal name="notify::active" handler="microphone_cb" object="CcApplicationsPanel" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="CcInfoRow" id="no_microphone">
+                                <property name="title" translatable="yes">_Microphone</property>
+                                <property name="subtitle" translatable="yes">Record audio with the microphone</property>
+                                <property name="info" translatable="yes">Disabled</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="AdwSwitchRow" id="location">
+                                <property name="title" translatable="yes">_Location Services</property>
+                                <property name="subtitle" translatable="yes">Access device location data</property>
+                                <property name="use-underline">True</property>
+                                <signal name="notify::active" handler="location_cb" object="CcApplicationsPanel" swapped="yes"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="CcInfoRow" id="no_location">
+                                <property name="title" translatable="yes">_Location Services</property>
+                                <property name="subtitle" translatable="yes">Access device location data</property>
+                                <property name="info" translatable="yes">Disabled</property>
                               </object>
                             </child>
                           </object>
                         </child>
 
-                      </object>
-                    </child>
+                        <child>
+                          <object class="AdwPreferencesGroup" id="other_permissions_section">
+                            <child>
+                              <object class="CcInfoRow" id="builtin">
+                                <property name="title" translatable="yes">Re_quired Access</property>
+                                <property name="subtitle" translatable="yes">System access that is required by the app</property>
+                                <property name="has-expander">True</property>
+                                <property name="is-link">True</property>
+                                <signal name="activated" handler="on_builtin_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
-                    <child>
-                      <object class="AdwPreferencesGroup" id="integration_section">
-                        <property name="title" translatable="yes">Permissions</property>
                         <child>
-                          <object class="AdwSwitchRow" id="search">
-                            <property name="title" translatable="yes">_Search</property>
-                            <property name="subtitle" translatable="yes">Receive system searches and send results</property>
-                            <property name="use-underline">True</property>
-                            <signal name="notify::active" handler="search_cb" object="CcApplicationsPanel" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="CcInfoRow" id="no_search">
-                            <property name="title" translatable="yes">_Search</property>
-                            <property name="subtitle" translatable="yes">Receive system searches and send results</property>
-                            <property name="info" translatable="yes">Disabled</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwSwitchRow" id="notification">
-                            <property name="title" translatable="yes">_Notifications</property>
-                            <property name="subtitle" translatable="yes">Show system notifications</property>
-                            <property name="use-underline">True</property>
-                            <signal name="notify::active" handler="notification_cb" object="CcApplicationsPanel" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwSwitchRow" id="background">
-                            <property name="title" translatable="yes">_Run in Background</property>
-                            <property name="subtitle" translatable="yes">Allow activity when the app is closed</property>
-                            <property name="use-underline">True</property>
-                            <signal name="notify::active" handler="background_cb" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwSwitchRow" id="screenshot">
-                            <property name="title" translatable="yes">Scr_eenshots</property>
-                            <property name="subtitle" translatable="yes">Take pictures of the screen at any time</property>
-                            <property name="use-underline">True</property>
-                            <signal name="notify::active" handler="screenshot_cb" object="CcApplicationsPanel" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwSwitchRow" id="wallpaper">
-                            <property name="title" translatable="yes">Change _Wallpaper</property>
-                            <property name="subtitle" translatable="yes">Change the desktop wallpaper.</property>
-                            <property name="use-underline">True</property>
-                            <signal name="notify::active" handler="wallpaper_cb" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwSwitchRow" id="sound">
-                            <property name="title" translatable="yes">So_unds</property>
-                            <property name="subtitle" translatable="yes">Reproduce sounds.</property>
-                            <property name="use-underline">True</property>
-                            <signal name="notify::active" handler="sound_cb" object="CcApplicationsPanel" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="CcInfoRow" id="no_sound">
-                            <property name="title" translatable="yes">So_unds</property>
-                            <property name="subtitle" translatable="yes">Reproduce sounds</property>
-                            <property name="info" translatable="yes">Disabled</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwSwitchRow" id="shortcuts">
-                            <property name="title" translatable="yes">_Inhibit Shortcuts</property>
-                            <property name="subtitle" translatable="yes">Block standard keyboard shortcuts</property>
-                            <property name="use-underline">True</property>
-                            <signal name="notify::active" handler="shortcuts_cb" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwSwitchRow" id="camera">
-                            <property name="title" translatable="yes">Camera</property>
-                            <property name="subtitle" translatable="yes">Take pictures with the camera</property>
-                            <signal name="notify::active" handler="camera_cb" object="CcApplicationsPanel" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="CcInfoRow" id="no_camera">
-                            <property name="title" translatable="yes">C_amera</property>
-                            <property name="subtitle" translatable="yes">Take pictures with the camera</property>
-                            <property name="info" translatable="yes">Disabled</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwSwitchRow" id="microphone">
-                            <property name="title" translatable="yes">_Microphone</property>
-                            <property name="subtitle" translatable="yes">Record audio with the microphone</property>
-                            <property name="use-underline">True</property>
-                            <signal name="notify::active" handler="microphone_cb" object="CcApplicationsPanel" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="CcInfoRow" id="no_microphone">
-                            <property name="title" translatable="yes">_Microphone</property>
-                            <property name="subtitle" translatable="yes">Record audio with the microphone</property>
-                            <property name="info" translatable="yes">Disabled</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="AdwSwitchRow" id="location">
-                            <property name="title" translatable="yes">_Location Services</property>
-                            <property name="subtitle" translatable="yes">Access device location data</property>
-                            <property name="use-underline">True</property>
-                            <signal name="notify::active" handler="location_cb" object="CcApplicationsPanel" swapped="yes"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="CcInfoRow" id="no_location">
-                            <property name="title" translatable="yes">_Location Services</property>
-                            <property name="subtitle" translatable="yes">Access device location data</property>
-                            <property name="info" translatable="yes">Disabled</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-
-                    <child>
-                      <object class="AdwPreferencesGroup" id="other_permissions_section">
-                        <child>
-                          <object class="CcInfoRow" id="builtin">
-                            <property name="title" translatable="yes">Re_quired Access</property>
-                            <property name="subtitle" translatable="yes">System access that is required by the app</property>
-                            <property name="has-expander">True</property>
-                            <property name="is-link">True</property>
-                            <signal name="activated" handler="on_builtin_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-
-                    <child>
-                      <object class="AdwPreferencesGroup" id="usage_section">
-                        <property name="title" translatable="yes">General</property>
-                        <child>
-                          <object class="CcInfoRow" id="handler_row">
-                            <property name="title" translatable="yes">_File &amp;amp; Link Associations</property>
-                            <property name="has-expander">True</property>
-                            <property name="is-link">True</property>
-                            <signal name="activated" handler="on_handler_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
-                          </object>
-                        </child>
-                        <child>
-                          <object class="CcInfoRow" id="storage">
-                            <property name="title" translatable="yes">S_torage</property>
-                            <property name="has-expander">1</property>
-                            <property name="is-link">1</property>
-                            <signal name="activated" handler="on_storage_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                          <object class="AdwPreferencesGroup" id="usage_section">
+                            <property name="title" translatable="yes">General</property>
+                            <child>
+                              <object class="CcInfoRow" id="handler_row">
+                                <property name="title" translatable="yes">_File &amp;amp; Link Associations</property>
+                                <property name="has-expander">True</property>
+                                <property name="is-link">True</property>
+                                <signal name="activated" handler="on_handler_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                              </object>
+                            </child>
+                            <child>
+                              <object class="CcInfoRow" id="storage">
+                                <property name="title" translatable="yes">S_torage</property>
+                                <property name="has-expander">1</property>
+                                <property name="is-link">1</property>
+                                <signal name="activated" handler="on_storage_row_activated_cb" object="CcApplicationsPanel" swapped="yes" />
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>