diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index f6c7a258f..08ba47f1a 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -138,6 +138,10 @@ http://www.tuxpaint.org/
     * Address issue with uppercase-only mode in Turkish locale.
       Pere Pujal i Carabantes <perepujal@gmail.com>
 
+    * Fixed a bug that can randomly crash Tux Paint when started in a language
+      with a input method map (*.im).
+      Mark Kim <markuskimius@gmail.com>
+
   * Ports & Building:
     -----------------
     * Windows
diff --git a/src/im.c b/src/im.c
index f8874e904..81a97bf55 100644
--- a/src/im.c
+++ b/src/im.c
@@ -447,6 +447,7 @@ static int sm_add(STATE_MACHINE * sm, char *seq, const wchar_t * unicode, char f
           return 1;
         }
       sm_init(next->state);
+      sm_found = next->state;
 
       /* Increase store for next time, if necessary */
       if (++(sm->next_size) >= sm->next_maxsize)
@@ -457,8 +458,6 @@ static int sm_add(STATE_MACHINE * sm, char *seq, const wchar_t * unicode, char f
               return 1;
             }
         }
-
-      sm_found = next->state;
     }
 
   /* Recurse */