diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 73fcea870..f5475c694 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,7 +90,6 @@
             android:label="@string/app_name"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTask"
-            android:noHistory="true"
             />
         <activity android:name="fr.gouv.etalab.mastodon.activities.MediaActivity"
             android:label="@string/app_name"
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java
index dc3b5d287..985ebb20b 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java
@@ -147,6 +147,20 @@ public class WebviewActivity extends AppCompatActivity {
         this.url = newUrl;
     }
 
+    @Override
+    public void onPause(){
+        super.onPause();
+        if( webView != null)
+            webView.onPause();
+    }
+
+    @Override
+    public void onResume(){
+        super.onResume();
+        if( webView != null)
+            webView.onResume();
+    }
+
     @Override
     public void onBackPressed() {
         if (webView.canGoBack()){
@@ -159,6 +173,7 @@ public class WebviewActivity extends AppCompatActivity {
     @Override
     public void onDestroy(){
         super.onDestroy();
-
+        if( webView != null)
+            webView.destroy();
     }
 }