diff --git a/keywords.txt b/keywords.txt
index 8fae01a..940c044 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -1,3 +1,4 @@
+# -*- eval: (ethan-wspace-mode -1); -*-
 # openssl/crypto/x509/t_x509.c
 Certificate:
 Data:
@@ -157,8 +158,9 @@ EC-Parameters:
 GROUP:
 
 # eck_prn.c ECPKParameters_print
-A:
-B:
+# NOTE: There is SPC after these so that they are not matched in hex strings
+A: 
+B: 
 
 # openssl/crypto/x509v3/v3_bcons.c
 # X509V3_add_value_bool
diff --git a/x509-mode.el b/x509-mode.el
index 6940ab5..e97a269 100644
--- a/x509-mode.el
+++ b/x509-mode.el
@@ -1142,6 +1142,7 @@ Return view buffer on success."
           (setq buffer-read-only t)
           ;; Return buffer
           swoop-buffer)
+      (kill-buffer swoop-buffer)
       (message "No BEGIN/END regions found.")
       ;; Return nil
       nil)))