diff --git a/CHANGELOG.md b/CHANGELOG.md
index b707851de..3ee1823d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -178,6 +178,7 @@
Feature #4632: AI priority: utilize vanilla AI GMSTs for priority rating
Feature #4636: Use sTo GMST in spellmaking menu
Feature #4642: Batching potion creation
+ Feature #4647: Cull actors outside of AI processing range
Feature #4682: Use the collision box from basic creature mesh if the X one have no collisions
Task #2490: Don't open command prompt window on Release-mode builds automatically
Task #4545: Enable is_pod string test
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 1c7576316..3c540a9d4 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -17,6 +17,7 @@
#include "../mwworld/ptr.hpp"
#include "../mwbase/environment.hpp"
+#include "../mwbase/statemanager.hpp"
#include "../mwbase/world.hpp"
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/dialoguemanager.hpp"
@@ -437,6 +438,10 @@ namespace MWMechanics
{
if (it->first == "Game" && it->second == "actors processing range")
{
+ int state = MWBase::Environment::get().getStateManager()->getState();
+ if (state != MWBase::StateManager::State_Running)
+ continue;
+
mActors.updateProcessingRange();
// Update mechanics for new processing range immediately
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 8e6e98612..3c2664857 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -75,7 +75,7 @@
-
+
@@ -87,7 +87,7 @@
-
+
@@ -224,7 +224,7 @@
-
+