diff --git a/etc/default/grub.d/remember-previous.cfg b/etc/default/grub.d/remember-previous.cfg
new file mode 100644
index 00000000..0394abc2
--- /dev/null
+++ b/etc/default/grub.d/remember-previous.cfg
@@ -0,0 +1,4 @@
+# This should remember which selection was booted previously and not have
+# Windows updates booting into Fedora and failing "Update and shut down".
+GRUB_DEFAULT=saved
+GRUB_SAVEDEFAULT=true