diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index 208ce4fbd4..4c0bca7f56 100644
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -638,6 +638,11 @@ if (are_notices_pending()) {
 	<?php endif?>
 
 <?php
+/* Determine shortcut section for XML-based packages */
+if (empty($shortcut_section) && !empty($xmlfile)) {
+	$shortcut_section = basename($pagename, '.xml');
+}
+
 if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service']) && isAllowedPage('status_services.php')) {
 	$ssvc = array();
 	switch ($shortcut_section) {
diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php
index 1795d07f62..d57396fe24 100644
--- a/src/usr/local/www/pkg.php
+++ b/src/usr/local/www/pkg.php
@@ -220,6 +220,10 @@ if ($pkg['tabs'] != "") {
 	ksort($tab_array);
 }
 
+if (!empty($pkg['tabs'])) {
+	$shortcut_section = $pkg['shortcut_section'];
+}
+
 include("head.inc");
 if (isset($tab_array)) {
 	foreach ($tab_array as $tabid => $tab) {
diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php
index 7200b38564..b9dad54f07 100644
--- a/src/usr/local/www/pkg_edit.php
+++ b/src/usr/local/www/pkg_edit.php
@@ -588,6 +588,9 @@ if ($pkg['tabs'] != "") {
 
 	ksort($tab_array);
 }
+if (!empty($pkg['tabs'])) {
+	$shortcut_section = $pkg['shortcut_section'];
+}
 
 include("head.inc");
 if ($pkg['custom_php_after_head_command']) {