diff --git a/UICatalog/Scenarios/CharacterMap.cs b/UICatalog/Scenarios/CharacterMap.cs
index 0b02656e6..1b5d2cb21 100644
--- a/UICatalog/Scenarios/CharacterMap.cs
+++ b/UICatalog/Scenarios/CharacterMap.cs
@@ -882,6 +882,9 @@ internal class CharMap : View
             return;
         }
 
+
+        args.Handled = true;
+
         if (me.Y == 0)
         {
             me.Y = Cursor.Y;
@@ -968,6 +971,7 @@ internal class CharMap : View
     {
         var client = new UcdApiClient ();
         var decResponse = string.Empty;
+        string getCodePointError = string.Empty;
 
         var waitIndicator = new Dialog
         {
@@ -999,12 +1003,13 @@ internal class CharMap : View
                                    try
                                    {
                                        decResponse = await client.GetCodepointDec (SelectedCodePoint);
+                                       Application.Invoke (() => waitIndicator.RequestStop ());
                                    }
                                    catch (HttpRequestException e)
                                    {
+                                       getCodePointError = errorLabel.Text = e.Message;
                                        Application.Invoke (() => waitIndicator.RequestStop ());
                                    }
-
                                };
         Application.Run (waitIndicator);
         waitIndicator.Dispose ();