diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e69b52383063a4fab6f5c9ad2e0751bca9e19d0..392ae8b9f55a3d963496cd41f40ff270bf026382 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ set(gweather_minimum_version 3.10)
 set(libaccounts_glib_minimum_version 1.4)
 set(libsignon_glib_minimum_version 1.8)
 set(json_glib_minimum_version 1.0.4)
-set(webkit2gtk_minimum_version 2.11.91)
+set(webkit2gtk_minimum_version 2.28.0)
 set(libcanberra_gtk_minimum_version 0.25)
 
 # Load modules from the source tree
diff --git a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
index e47ce1881f1687244e53fa4c5ea165dca8b26066..df1c0964f799a0380e53c7eb928260f745766b64 100644
--- a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
+++ b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
@@ -574,6 +574,7 @@ e_credentials_prompter_impl_oauth2_show_dialog (ECredentialsPrompterImplOAuth2 *
 	GtkWindow *dialog_parent;
 	ECredentialsPrompter *prompter;
 	WebKitSettings *webkit_settings;
+	WebKitWebContext *web_context;
 	gchar *title, *uri;
 	GString *info_markup;
 	gint row = 0;
@@ -733,7 +734,14 @@ e_credentials_prompter_impl_oauth2_show_dialog (ECredentialsPrompterImplOAuth2 *
 		"media-playback-allows-inline", FALSE,
 		NULL);
 
-	widget = webkit_web_view_new_with_settings (webkit_settings);
+	web_context = webkit_web_context_new ();
+	webkit_web_context_set_sandbox_enabled (web_context, TRUE);
+
+	widget = g_object_new (WEBKIT_TYPE_WEB_VIEW,
+			"settings", webkit_settings,
+			"web-context", web_context,
+			NULL);
+
 	g_object_set (
 		G_OBJECT (widget),
 		"hexpand", TRUE,
@@ -743,6 +751,7 @@ e_credentials_prompter_impl_oauth2_show_dialog (ECredentialsPrompterImplOAuth2 *
 		NULL);
 	gtk_container_add (GTK_CONTAINER (scrolled_window), widget);
 	g_object_unref (webkit_settings);
+	g_object_unref (web_context);
 
 	prompter_oauth2->priv->web_view = WEBKIT_WEB_VIEW (widget);