diff --git a/proguard.flags b/proguard.flags
index 6d41d17436e..a07b2ec2876 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -12,3 +12,7 @@
 -keep class com.android.settings.accounts.*
 -keep class com.android.settings.fuelgauge.*
 
+# Keep click responders
+-keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
+  *** onClick*(...);
+}
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
index 23958ddb450..c6fe7de7e3b 100644
--- a/res/layout/user_dictionary_add_word.xml
+++ b/res/layout/user_dictionary_add_word.xml
@@ -67,7 +67,8 @@
               style="?android:attr/buttonBarButtonStyle"
               android:textSize="14sp"
               android:text="@string/cancel"
-              android:layout_height="wrap_content" />
+              android:layout_height="wrap_content"
+              android:onClick="onClickCancel" />
       <Button android:layout_width="0dip"
               android:layout_gravity="center_horizontal"
               android:layout_weight="1"
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index c570983ce29..61c4e3c5d4e 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -21,6 +21,7 @@ import com.android.settings.R;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.EditText;
 
 public class UserDictionaryAddWordActivity extends Activity {
@@ -38,4 +39,8 @@ public class UserDictionaryAddWordActivity extends Activity {
         mEditText.setText(word);
         mEditText.setSelection(word.length());
     }
+
+    public void onClickCancel(final View v) {
+        finish();
+    }
 }