diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 3a0b75111..d4e2f67a0 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -7,6 +7,7 @@
  - fixed #10409: Problem using hash in metadata possible values
  - fixed a similar problem with metadata in the Shortcut Asset.
  - fixed #10396: Syndicated Content wobject not displaying edit controls
+ - fixed #10386: Template override missing in nav shortcut
 
 7.7.7
  - Added EMS Schedule table
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 0ab791bdc..87a7231a4 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -368,6 +368,15 @@ sub getFieldsList {
 }
 
 #-------------------------------------------------------------------
+
+=head2 getOverridesList
+
+Generates a table of overrides, based on the shortcutted Asset's definition sub.
+If the field type is hidden, or the field label is empty, then an override is not
+generated for that field
+
+=cut
+
 sub getOverridesList {
 	my $self = shift;
 	my $output = '';
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 7a41dbd93..4cbbbb432 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -34,19 +34,21 @@ sub definition {
 		tableName=>'Navigation',
 		className=>'WebGUI::Asset::Wobject::Navigation',
 		properties=>{
-			templateId =>{
-				fieldType=>"template",
-				defaultValue=>'PBtmpl0000000000000048'
-				},
-			mimeType =>{
-				fieldType=>"mimeType",
-				defaultValue=>'text/html'
-				},
-			assetsToInclude=>{
-				fieldType=>'checkList',
-				defaultValue=>"descendants"
-				},
-			startType=>{
+            templateId => {
+                label        => $i18n->get(1096),
+                fieldType    => "template",
+                defaultValue => 'PBtmpl0000000000000048'
+            },
+            mimeType => {
+                label        => $i18n->get('mimeType'),
+                fieldType    => "mimeType",
+                defaultValue => 'text/html'
+            },
+            assetsToInclude => {
+                fieldType    =>'checkList',
+                defaultValue =>"descendants"
+            },
+			startType => {
 				fieldType=>'selectBox',
 				defaultValue=>"relativeToCurrentUrl"
 				},
@@ -62,22 +64,26 @@ sub definition {
 				fieldType=>'selectBox',
 				defaultValue=>55
 				},
-			showSystemPages=>{
-				fieldType=>'yesNo',
-				defaultValue=>0
-				},
-			showHiddenPages=>{
-				fieldType=>'yesNo',
-				defaultValue=>0
-				},
-			showUnprivilegedPages=>{
-				fieldType=>'yesNo',
-				defaultValue=>0
-				},
-			reversePageLoop=>{
-				fieldType=>'yesNo',
-				defaultValue=>0
-				},
+			showSystemPages => {
+                label        => $i18n->get(30),
+				fieldType    => 'yesNo',
+				defaultValue => 0,
+            },
+			showHiddenPages => {
+                label        => $i18n->get(31),
+				fieldType    => 'yesNo',
+				defaultValue => 0,
+            },
+			showUnprivilegedPages => {
+                label        => $i18n->get(32),
+				fieldType    => 'yesNo',
+				defaultValue => 0,
+            },
+			reversePageLoop => {
+                label        => $i18n->get('reverse page loop'),
+				fieldType    => 'yesNo',
+				defaultValue => 0,
+            },
 			}
 		});
         return $class->SUPER::definition($session, $definition);