diff --git a/GitUI/SpellChecker/EditNetSpell.cs b/GitUI/SpellChecker/EditNetSpell.cs
index 60fedc6bd1a..6928a0ed5d3 100644
--- a/GitUI/SpellChecker/EditNetSpell.cs
+++ b/GitUI/SpellChecker/EditNetSpell.cs
@@ -983,8 +983,11 @@ private void AutoComplete_Click (object sender, EventArgs e)
 
         private void AutoCompleteTimer_Tick (object sender, EventArgs e)
         {
-            UpdateOrShowAutoComplete(false);
-            AutoCompleteTimer.Stop();
+            if (!_customUnderlines.IsImeStartingComposition)
+            {
+                UpdateOrShowAutoComplete(false);
+                AutoCompleteTimer.Stop();
+            }
         }
 
         public void CancelAutoComplete ()