diff --git a/plugins/builtin/include/content/views/view_hex_editor.hpp b/plugins/builtin/include/content/views/view_hex_editor.hpp
index f2160299b..b81fba7ff 100644
--- a/plugins/builtin/include/content/views/view_hex_editor.hpp
+++ b/plugins/builtin/include/content/views/view_hex_editor.hpp
@@ -41,7 +41,9 @@ namespace hex::plugin::builtin {
             if (end == InvalidSelection)
                 end = start;
 
-            const size_t maxAddress = ImHexApi::Provider::get()->getActualSize() - 1;
+            auto provider = ImHexApi::Provider::get();
+
+            const size_t maxAddress = provider->getActualSize() + provider->getBaseAddress() - 1;
 
             this->m_selectionChanged = this->m_selectionStart != start || this->m_selectionEnd != end;
 
diff --git a/plugins/builtin/source/content/views/view_bookmarks.cpp b/plugins/builtin/source/content/views/view_bookmarks.cpp
index 7d1438e5f..0a0c2c5e1 100644
--- a/plugins/builtin/source/content/views/view_bookmarks.cpp
+++ b/plugins/builtin/source/content/views/view_bookmarks.cpp
@@ -126,7 +126,7 @@ namespace hex::plugin::builtin {
             ImGui::PushItemWidth(ImGui::GetContentRegionAvailWidth());
             ImGui::InputTextWithHint("##filter", "Filter", this->m_currFilter);
             ImGui::PopItemWidth();
-            
+
             ImGui::NewLine();
 
             if (ImGui::BeginChild("##bookmarks")) {