diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/App.xaml.cs b/src/modules/keyboardmanager/KeyboardManagerEditorUI/App.xaml.cs
index f35c092534..26641ab444 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/App.xaml.cs
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/App.xaml.cs
@@ -39,7 +39,6 @@ namespace KeyboardManagerEditorUI
         /// </summary>
         public App()
         {
-            global::System.Diagnostics.Debugger.Break();
             this.InitializeComponent();
 
             Task.Run(() =>
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Interop/KeyboardMappingService.cs b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Interop/KeyboardMappingService.cs
index 37fb46c3ab..d6c7bedb77 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Interop/KeyboardMappingService.cs
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Interop/KeyboardMappingService.cs
@@ -185,7 +185,7 @@ namespace KeyboardManagerEditorUI.Interop
             return KeyboardManagerInterop.AddShortcutRemap(_configHandle, originalKeys, targetKeys, targetApp, (int)operationType);
         }
 
-        public bool AddShorcutMapping(ShortcutKeyMapping shortcutKeyMapping)
+        public bool AddShortcutMapping(ShortcutKeyMapping shortcutKeyMapping)
         {
             if (string.IsNullOrEmpty(shortcutKeyMapping.OriginalKeys) || string.IsNullOrEmpty(shortcutKeyMapping.TargetKeys))
             {
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
index 4ae2b0b1f3..375cf1c5a0 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
@@ -172,5 +172,15 @@
                 <controls:AppPageInputControl x:Name="AppShortcutControl" />
             </Grid>
         </ContentDialog>
+
+        <TeachingTip
+            x:Name="ValidationTip"
+            x:Uid="ProgramsPageValidationTip"
+            IsLightDismissEnabled="True"
+            PreferredPlacement="Center">
+            <TeachingTip.IconSource>
+                <SymbolIconSource Symbol="Important" />
+            </TeachingTip.IconSource>
+        </TeachingTip>
     </Grid>
 </Page>
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml.cs b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml.cs
index d0dbe4b9fb..0a6a1e511c 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml.cs
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml.cs
@@ -165,12 +165,6 @@ namespace KeyboardManagerEditorUI.Pages
                 // Shortcut to text mapping
                 string originalKeysString = string.Join(";", keys.Select(k => _mappingService.GetKeyCodeFromName(k).ToString(CultureInfo.InvariantCulture)));
 
-                // if (isAppSpecific && !string.IsNullOrEmpty(appName))
-                // {
-                //    saved = _mappingService.AddShortcutMapping(originalKeysString, programPath, appName, ShortcutOperationType.RemapText);
-                // }
-                // else
-                // {
                 ShortcutKeyMapping shortcutKeyMapping = new ShortcutKeyMapping()
                 {
                     OperationType = ShortcutOperationType.RunProgram,
@@ -183,7 +177,7 @@ namespace KeyboardManagerEditorUI.Pages
                     Elevation = elevationLevel,
                 };
 
-                saved = _mappingService.AddShorcutMapping(shortcutKeyMapping);
+                saved = _mappingService.AddShortcutMapping(shortcutKeyMapping);
 
                 if (saved)
                 {
@@ -239,13 +233,13 @@ namespace KeyboardManagerEditorUI.Pages
 
         private void ShowValidationError(ValidationErrorType errorType, ContentDialogButtonClickEventArgs args)
         {
-            // if (ValidationHelper.ValidationMessages.TryGetValue(errorType, out (string Title, string Message) error))
-            // {
-            //    ValidationTip.Title = error.Title;
-            //    ValidationTip.Subtitle = error.Message;
-            //    ValidationTip.IsOpen = true;
-            //    args.Cancel = true;
-            // }
+            if (ValidationHelper.ValidationMessages.TryGetValue(errorType, out (string Title, string Message) error))
+            {
+                ValidationTip.Title = error.Title;
+                ValidationTip.Subtitle = error.Message;
+                ValidationTip.IsOpen = true;
+                args.Cancel = true;
+            }
         }
 
         public void Dispose()
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml
index 670ea83060..6ba1131273 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml
@@ -194,7 +194,7 @@
         </ContentDialog>
         <TeachingTip
             x:Name="OrphanedKeysTeachingTip"
-            x:Uid="RemmapingsPageOrphanedKeysTeachingTip"
+            x:Uid="RemapingsPageOrphanedKeysTeachingTip"
             ActionButtonClick="OrphanedKeysTeachingTip_ActionButtonClick"
             ActionButtonStyle="{StaticResource AccentButtonStyle}"
             CloseButtonClick="OrphanedKeysTeachingTip_CloseButtonClick"
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml
index 73b807daea..1195791d48 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml
@@ -155,5 +155,15 @@
                 <controls:UrlPageInputControl x:Name="UrlShortcutControl" />
             </Grid>
         </ContentDialog>
+
+        <TeachingTip
+            x:Name="ValidationTip"
+            x:Uid="UrlPageValidationTip"
+            IsLightDismissEnabled="True"
+            PreferredPlacement="Center">
+        <TeachingTip.IconSource>
+            <SymbolIconSource Symbol="Important" />
+        </TeachingTip.IconSource>
+        </TeachingTip>
     </Grid>
 </Page>
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml.cs b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml.cs
index 8ec91db0b3..16b070c77f 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml.cs
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml.cs
@@ -179,12 +179,6 @@ namespace KeyboardManagerEditorUI.Pages
                 // Shortcut to text mapping
                 string originalKeysString = string.Join(";", keys.Select(k => _mappingService.GetKeyCodeFromName(k).ToString(CultureInfo.InvariantCulture)));
 
-                // if (isAppSpecific && !string.IsNullOrEmpty(appName))
-                // {
-                //    saved = _mappingService.AddShortcutMapping(originalKeysString, programPath, appName, ShortcutOperationType.RemapText);
-                // }
-                // else
-                // {
                 ShortcutKeyMapping shortcutKeyMapping = new ShortcutKeyMapping()
                 {
                     OperationType = ShortcutOperationType.OpenUri,
@@ -193,7 +187,7 @@ namespace KeyboardManagerEditorUI.Pages
                     UriToOpen = urlPath,
                 };
 
-                saved = _mappingService.AddShorcutMapping(shortcutKeyMapping);
+                saved = _mappingService.AddShortcutMapping(shortcutKeyMapping);
 
                 if (saved)
                 {
@@ -210,13 +204,13 @@ namespace KeyboardManagerEditorUI.Pages
 
         private void ShowValidationError(ValidationErrorType errorType, ContentDialogButtonClickEventArgs args)
         {
-            // if (ValidationHelper.ValidationMessages.TryGetValue(errorType, out (string Title, string Message) error))
-            // {
-            //    ValidationTip.Title = error.Title;
-            //    ValidationTip.Subtitle = error.Message;
-            //    ValidationTip.IsOpen = true;
-            //    args.Cancel = true;
-            // }
+            if (ValidationHelper.ValidationMessages.TryGetValue(errorType, out (string Title, string Message) error))
+            {
+                ValidationTip.Title = error.Title;
+                ValidationTip.Subtitle = error.Message;
+                ValidationTip.IsOpen = true;
+                args.Cancel = true;
+            }
         }
 
         private void DeleteButton_Click(object sender, RoutedEventArgs e)
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Strings/en-US/Resources.resw b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Strings/en-US/Resources.resw
index 3acf1058ab..95312da33c 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Strings/en-US/Resources.resw
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Strings/en-US/Resources.resw
@@ -141,13 +141,13 @@
   <data name="RemappingsPageOriginalKeysTextBlock.Text" xml:space="preserve">
     <value>Original key(s)</value>
   </data>
-  <data name="RemmapingsPageOrphanedKeysTeachingTip.ActionButtonContent" xml:space="preserve">
+  <data name="RemapingsPageOrphanedKeysTeachingTip.ActionButtonContent" xml:space="preserve">
     <value>Continue anyway</value>
   </data>
-  <data name="RemmapingsPageOrphanedKeysTeachingTip.CloseButtonContent" xml:space="preserve">
+  <data name="RemapingsPageOrphanedKeysTeachingTip.CloseButtonContent" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="RemmapingsPageOrphanedKeysTeachingTip.Title" xml:space="preserve">
+  <data name="RemapingsPageOrphanedKeysTeachingTip.Title" xml:space="preserve">
     <value>Orphaned Keys Warning</value>
   </data>
   <data name="RemappingsPageValidationTeachingTip.CloseButtonContent" xml:space="preserve">
@@ -309,4 +309,10 @@
   <data name="AppPageInputControlExtraOptionsTextBlock.Text" xml:space="preserve">
     <value>More options</value>
   </data>
+  <data name="ProgramsPageValidationTip.CloseButtonContent" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="UrlPageValidationTip.CloseButtonContent" xml:space="preserve">
+    <value>OK</value>
+  </data>
 </root>
\ No newline at end of file