diff --git a/core/core-dotspacemacs.el b/core/core-dotspacemacs.el
index 7f47185a6..d2effb3aa 100644
--- a/core/core-dotspacemacs.el
+++ b/core/core-dotspacemacs.el
@@ -670,6 +670,11 @@ If it does deactivate it here. (default t)"
   'boolean
   'spacemacs-dotspacemacs-init)
 
+(spacemacs|defc dotspacemacs-use-SPC-as-y nil
+  "Accept SPC as y for prompts if non nil. (default nil)"
+  'boolean
+  'spacemacs-dotspacemacs-init)
+
 (spacemacs|defc dotspacemacs-swap-number-row nil
   "Shift number row for easier access.
 
diff --git a/core/templates/.spacemacs.template b/core/templates/.spacemacs.template
index 965b683d0..ebf56c196 100644
--- a/core/templates/.spacemacs.template
+++ b/core/templates/.spacemacs.template
@@ -487,6 +487,9 @@ It should only modify the values of Spacemacs settings."
    ;; (default t)
    dotspacemacs-use-clean-aindent-mode t
 
+   ;; Accept SPC as y for prompts if non nil. (default nil)
+   dotspacemacs-use-SPC-as-y nil
+
    ;; If non-nil shift your number row to match the entered keyboard layout
    ;; (only in insert state). Currently supported keyboard layouts are:
    ;; `qwerty-us', `qwertz-de' and `querty-ca-fr'.
diff --git a/layers/+spacemacs/spacemacs-defaults/config.el b/layers/+spacemacs/spacemacs-defaults/config.el
index abcf59644..eec4dbfc9 100644
--- a/layers/+spacemacs/spacemacs-defaults/config.el
+++ b/layers/+spacemacs/spacemacs-defaults/config.el
@@ -75,6 +75,10 @@ It runs `tabulated-list-revert-hook', then calls `tabulated-list-print'."
 ;; Don't try to ping things that look like domain names
 (setq ffap-machine-p-known 'reject)
 
+;; Don't accept SPC as a yes for prompts
+(when dotspacemacs-use-SPC-as-y
+  (define-key query-replace-map (kbd "SPC") nil))
+
 ;; ---------------------------------------------------------------------------
 ;; Mouse
 ;; ---------------------------------------------------------------------------
@@ -154,11 +158,11 @@ It runs `tabulated-list-revert-hook', then calls `tabulated-list-print'."
 ;; Fullscreen/maximize frame on startup
 (when (and (not spacemacs-initialized)
            dotspacemacs-fullscreen-at-startup)
-    ;; spacemacs/toggle-fullscreen-frame-on is NOT available during the startup,
-    ;; but IS available during the subsequent config reloads
-    (if (fboundp 'spacemacs/toggle-fullscreen-frame-on)
-        (spacemacs/toggle-fullscreen-frame-on)
-      (spacemacs/toggle-frame-fullscreen)))
+  ;; spacemacs/toggle-fullscreen-frame-on is NOT available during the startup,
+  ;; but IS available during the subsequent config reloads
+  (if (fboundp 'spacemacs/toggle-fullscreen-frame-on)
+      (spacemacs/toggle-fullscreen-frame-on)
+    (spacemacs/toggle-frame-fullscreen)))
 
 (setq ns-use-native-fullscreen (not dotspacemacs-fullscreen-use-non-native))