diff --git a/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/FbWrapper.java b/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/FbWrapper.java
index 1267f1f..3298653 100644
--- a/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/FbWrapper.java
+++ b/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/FbWrapper.java
@@ -313,8 +313,7 @@ public void onClick(View v) {
                     break;
                 case R.id.menu_kill:
                     mWebViewContainer.removeView(mWebView);
-                    mWebView.removeAllViews();
-                    mWebView.destroy();
+                    destroyWebView();
                     finish();
                     break;
             }
diff --git a/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/activity/BaseFacebookWebViewActivity.java b/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/activity/BaseFacebookWebViewActivity.java
index f067069..07f35c4 100644
--- a/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/activity/BaseFacebookWebViewActivity.java
+++ b/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/activity/BaseFacebookWebViewActivity.java
@@ -333,6 +333,8 @@ protected void shareCurrentPage() {
      */
     protected void destroyWebView() {
         if (mWebView != null) {
+            mWebView.removeAllViews();
+
             /** Free memory and destroy WebView */
             mWebView.freeMemory();
             mWebView.destroy();
diff --git a/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/webview/FacebookWebChromeClient.java b/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/webview/FacebookWebChromeClient.java
index 6376958..db39993 100644
--- a/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/webview/FacebookWebChromeClient.java
+++ b/Tinfoil-for-Facebook/src/main/java/com/danvelazco/fbwrapper/webview/FacebookWebChromeClient.java
@@ -254,8 +254,7 @@ public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, Str
      *                   associated with this file picker.
      */
     @SuppressWarnings("unused")
-    public void openFileChooser(ValueCallback<Uri> uploadMsg,
-                                String acceptType) {
+    public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType) {
         openFileChooser(uploadMsg, acceptType, "");
     }