diff --git a/Source/CharacterChooserForm.cs b/Source/CharacterChooserForm.cs
index 82fafdd..9ebd536 100644
--- a/Source/CharacterChooserForm.cs
+++ b/Source/CharacterChooserForm.cs
@@ -302,7 +302,6 @@ private bool LoadCharacterTextBox(int selectedIndex, TextBox textBox)
         protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         {
             if ((keyData == Keys.Escape) || 
-                (keyData == Keys.Enter) || 
                 (keyData == (Keys.Control | Keys.W)) ||
                 (keyData == (Keys.Alt | Keys.F4)))
             {
@@ -372,9 +371,9 @@ private void ToolTip_Popup(object sender, PopupEventArgs e)
         /// </summary>
         /// <param name="c"></param>
         /// <returns>category description</returns>
-        private string GetUnicodeCategoryDescription(char c)
+        private static string GetUnicodeCategoryDescription(char c)
         {
-            string s = string.Empty;
+            string s ;
             UnicodeCategory uc = Char.GetUnicodeCategory(c);
 
             switch (uc)
@@ -409,6 +408,7 @@ private string GetUnicodeCategoryDescription(char c)
                 case UnicodeCategory.ModifierSymbol: s = Resources.Sk; break;
                 case UnicodeCategory.OtherSymbol: s = Resources.So; break;
                 case UnicodeCategory.OtherNotAssigned: s = Resources.Cn; break;
+                default: s = string.Empty; break;
             }
 
             return s;