diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 220566a..c0a91ad 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -24,6 +24,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
+import android.os.Process;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.ContextMenu;
@@ -43,6 +44,8 @@
 import com.android.browser.search.SearchEngine;
 import com.android.browser.stub.NullController;
 
+import java.util.Locale;
+
 import org.codeaurora.swe.CookieManager;
 import org.codeaurora.swe.WebView;
 
@@ -61,6 +64,7 @@
     private ActivityController mController = NullController.INSTANCE;
 
     private Handler mHandler = new Handler();
+    private final Locale mCurrentLocale = Locale.getDefault();
 
     private UiController mUiController;
     private Handler mHandlerEx = new Handler();
@@ -300,6 +304,11 @@
             mEngineInitializer.onActivityDestroy();
         mController.onDestroy();
         mController = NullController.INSTANCE;
+        if (!Locale.getDefault().equals(mCurrentLocale)) {
+            Log.e(LOGTAG,"Force Killing Browser on locale change");
+            Process.killProcess(Process.myPid());
+        }
+
     }
 
     @Override
