diff --git a/plugins/builtin/source/ui/hex_editor.cpp b/plugins/builtin/source/ui/hex_editor.cpp
index a64b0b0c6..78aa9c0c2 100644
--- a/plugins/builtin/source/ui/hex_editor.cpp
+++ b/plugins/builtin/source/ui/hex_editor.cpp
@@ -284,7 +284,7 @@ namespace hex::plugin::builtin::ui {
                     auto nextEditingAddress = *this->m_editingAddress + this->m_currDataVisualizer->getBytesPerCell();
                     this->setSelection(nextEditingAddress, nextEditingAddress);
 
-                    if (nextEditingAddress >= this->m_provider->getSize())
+                    if (nextEditingAddress >= this->m_provider->getBaseAddress() + this->m_provider->getCurrentPageAddress() + this->m_provider->getSize())
                         this->m_editingAddress = std::nullopt;
                     else
                         this->m_editingAddress = nextEditingAddress;