diff --git a/src/commands.cc b/src/commands.cc
index 1075c332a..446ecd297 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -1993,7 +1993,7 @@ void context_wrap(const ParametersParser& parser, Context& context, StringView d
                                        Context::Flags::Draft};
             Context& c = input_handler.context();
 
-            ScopedSetBool disable_history(c.history_disabled());
+            ScopedSetBool noninteractive(c.noninteractive());
 
             func(parser, c);
         };
@@ -2044,7 +2044,7 @@ void context_wrap(const ParametersParser& parser, Context& context, StringView d
 
     Context& c = *effective_context;
 
-    ScopedSetBool disable_history(c.history_disabled());
+    ScopedSetBool noninteractive(c.noninteractive());
     ScopedEdition edition{c};
     ScopedSelectionEdition selection_edition{c};
 
@@ -2222,7 +2222,7 @@ const CommandDesc prompt_cmd = {
                     sc.env_vars.erase("text"_sv);
                 });
 
-                ScopedSetBool disable_history{context.history_disabled()};
+                ScopedSetBool noninteractive{context.noninteractive()};
 
                 StringView cmd;
                 switch (event)
@@ -2269,7 +2269,7 @@ const CommandDesc menu_cmd = {
 
         if (count == modulo and parser.get_switch("auto-single"))
         {
-            ScopedSetBool disable_history{context.history_disabled()};
+            ScopedSetBool noninteractive{context.noninteractive()};
 
             CommandManager::instance().execute(parser[1], context);
             return;
@@ -2293,7 +2293,7 @@ const CommandDesc menu_cmd = {
         CapturedShellContext sc{shell_context};
         context.input_handler().menu(std::move(choices),
             [=](int choice, MenuEvent event, Context& context) {
-                ScopedSetBool disable_history{context.history_disabled()};
+                ScopedSetBool noninteractive{context.noninteractive()};
 
                 if (event == MenuEvent::Validate and choice >= 0 and choice < commands.size())
                   CommandManager::instance().execute(commands[choice], context, sc);
@@ -2324,7 +2324,7 @@ const CommandDesc on_key_cmd = {
             parser.get_switch("mode-name").value_or("on-key"),
             KeymapMode::None, [=](Key key, Context& context) mutable {
             sc.env_vars["key"_sv] = to_string(key);
-            ScopedSetBool disable_history{context.history_disabled()};
+            ScopedSetBool noninteractive{context.noninteractive()};
 
             CommandManager::instance().execute(command, context, sc);
         });
@@ -2646,7 +2646,7 @@ void enter_user_mode(Context& context, String mode_name, KeymapMode mode, bool l
             return;
 
         ScopedSetBool disable_keymaps(context.keymaps_disabled());
-        ScopedSetBool disable_history(context.history_disabled());
+        ScopedSetBool noninteractive(context.noninteractive());
 
         InputHandler::ScopedForceNormal force_normal{context.input_handler(), {}};
 
diff --git a/src/context.hh b/src/context.hh
index 34bb9e12e..69377148e 100644
--- a/src/context.hh
+++ b/src/context.hh
@@ -126,8 +126,8 @@ public:
     NestedBool& keymaps_disabled() { return m_keymaps_disabled; }
     const NestedBool& keymaps_disabled() const { return m_keymaps_disabled; }
 
-    NestedBool& history_disabled() { return m_history_disabled; }
-    const NestedBool& history_disabled() const { return m_history_disabled; }
+    NestedBool& noninteractive() { return m_noninteractive; }
+    const NestedBool& noninteractive() const { return m_noninteractive; }
 
     Flags flags() const { return m_flags; }
 
@@ -207,7 +207,7 @@ private:
 
     NestedBool m_hooks_disabled;
     NestedBool m_keymaps_disabled;
-    NestedBool m_history_disabled;
+    NestedBool m_noninteractive;
 };
 
 struct ScopedEdition
diff --git a/src/hook_manager.cc b/src/hook_manager.cc
index 406b803f5..afab54615 100644
--- a/src/hook_manager.cc
+++ b/src/hook_manager.cc
@@ -37,7 +37,7 @@ struct HookManager::HookData
                                   enum_desc(Meta::Type<Hook>{})[to_underlying(hook)].name,
                                   param, group));
 
-        ScopedSetBool disable_history{context.history_disabled()};
+        ScopedSetBool noninteractive{context.noninteractive()};
 
         EnvVarMap env_vars{ {"hook_param", param.str()} };
         for (size_t i = 0; i < captures.size(); ++i)
diff --git a/src/input_handler.cc b/src/input_handler.cc
index a36d13f15..4e953738f 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -1197,7 +1197,7 @@ private:
 
     void history_push(StringView entry)
     {
-        if (entry.empty() or context().history_disabled() or
+        if (entry.empty() or context().noninteractive() or
             (m_flags & PromptFlags::DropHistoryEntriesWithBlankPrefix and
              is_horizontal_blank(entry[0_byte])))
             return;
@@ -1772,7 +1772,7 @@ void InputHandler::handle_key(Key key)
     KeymapManager& keymaps = m_context.keymaps();
     if (keymaps.is_mapped(key, keymap_mode) and not m_context.keymaps_disabled())
     {
-        ScopedSetBool disable_history{context().history_disabled()};
+        ScopedSetBool noninteractive{context().noninteractive()};
 
         for (auto& k : keymaps.get_mapping_keys(key, keymap_mode))
             process_key(k);
diff --git a/src/normal.cc b/src/normal.cc
index 08ce028de..01f56a015 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -1016,7 +1016,7 @@ void select_regex(Context& context, NormalParams params)
         RegisterManager::instance()[reg].restore(context, saved_reg);
         if (event == PromptEvent::Abort)
             return;
-        if (not context.history_disabled())
+        if (not context.noninteractive())
             RegisterManager::instance()[reg].set(context, ex.str());
 
         auto& selections = context.selections();
@@ -1038,7 +1038,7 @@ void split_regex(Context& context, NormalParams params)
         RegisterManager::instance()[reg].restore(context, saved_reg);
         if (event == PromptEvent::Abort)
             return;
-        if (not context.history_disabled())
+        if (not context.noninteractive())
             RegisterManager::instance()[reg].set(context, ex.str());
 
         auto& selections = context.selections();
@@ -1142,7 +1142,7 @@ void keep(Context& context, NormalParams params)
         RegisterManager::instance()[reg].restore(context, saved_reg);
         if (event == PromptEvent::Abort)
             return;
-        if (not context.history_disabled())
+        if (not context.noninteractive())
             RegisterManager::instance()[reg].set(context, regex.str());
 
         if (regex.empty() or regex.str().empty())
@@ -2049,7 +2049,7 @@ void exec_user_mappings(Context& context, NormalParams params)
             return;
 
         ScopedSetBool disable_keymaps(context.keymaps_disabled());
-        ScopedSetBool disable_history(context.history_disabled());
+        ScopedSetBool noninteractive(context.noninteractive());
 
         InputHandler::ScopedForceNormal force_normal{context.input_handler(), params};