diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java b/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
index caa2f68a..d450a51f 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
@@ -100,6 +100,7 @@ public class ContextMenuWebView extends NestedWebView {
                                                                 MainActivity.REQUEST_CODE__ACCESS_EXTERNAL_STORAGE);
                                                 }
                                             })
+                                            .setCancelable(false)
                                             .setNegativeButton(context.getText(android.R.string.no), null)
                                             .show();
                                 }
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java b/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java
index 60a8f8cc..1dc21836 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java
@@ -18,7 +18,6 @@
  */
 package com.github.dfa.diaspora_android.web;
 
-import android.content.DialogInterface;
 import android.webkit.JsResult;
 import android.webkit.WebView;
 import android.widget.ProgressBar;
@@ -65,20 +64,13 @@ public class DiasporaStreamWebChromeClient extends FileUploadWebChromeClient {
         ThemedAlertDialogBuilder builder = new ThemedAlertDialogBuilder(view.getContext(), AppSettings.get());
         builder.setTitle(view.getContext().getString(R.string.confirmation))
                 .setMessage(message)
-                .setPositiveButton(android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                result.confirm();
-                            }
-                        })
-                .setNegativeButton(android.R.string.cancel,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                result.cancel();
-                            }
-                        })
-                .create()
-                .show();
+                .setPositiveButton(android.R.string.ok, (dialog, which) -> result.confirm())
+                .setNegativeButton(android.R.string.cancel, (dialog, which) -> result.cancel())
+                .setOnCancelListener(dialog -> {
+                    result.cancel();
+                    dialog.dismiss();
+                })
+                .create().show();
         return true;
     }
 
diff --git a/build.gradle b/build.gradle
index 3f0532f1..b84d2d90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,8 +12,6 @@ buildscript {
     ext.version_library_appcompat = "27.1.0"
     // https://github.com/JakeWharton/butterknife/releases
     ext.version_library_butterknife = "8.8.1"
-    // https://github.com/atlassian/commonmark-java/releases
-    ext.version_library_commonmark = "0.10.0"
     // https://github.com/guardianproject/NetCipher/releases
     ext.version_library_netcipher = "2.0.0-alpha1"
     // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-gradle-plugin#LookAtCentral