diff --git a/lib/pages/key_verification/key_verification_dialog.dart b/lib/pages/key_verification/key_verification_dialog.dart
index 69f3a1ab3..99d082a76 100644
--- a/lib/pages/key_verification/key_verification_dialog.dart
+++ b/lib/pages/key_verification/key_verification_dialog.dart
@@ -228,6 +228,13 @@ class KeyVerificationPageState extends State<KeyVerificationDialog> {
             ],
           ),
         );
+        buttons.add(
+          TextButton.icon(
+            icon: const Icon(Icons.close),
+            label: Text(L10n.of(context)!.cancel),
+            onPressed: () => widget.request.cancel(),
+          ),
+        );
 
         break;
       case KeyVerificationState.askSas:
@@ -322,11 +329,13 @@ class KeyVerificationPageState extends State<KeyVerificationDialog> {
         );
         break;
       case KeyVerificationState.error:
+        title = const Text('');
         body = Column(
           mainAxisSize: MainAxisSize.min,
           children: <Widget>[
             const Icon(Icons.cancel, color: Colors.red, size: 128.0),
-            const SizedBox(height: 10),
+            const SizedBox(height: 16),
+            // TODO: Add better error UI to user
             Text(
               'Error ${widget.request.canceledCode}: ${widget.request.canceledReason}',
               textAlign: TextAlign.center,