diff --git a/plugins/builtin/source/content/providers/intel_hex_provider.cpp b/plugins/builtin/source/content/providers/intel_hex_provider.cpp
index e3216bc2f..2c8b2dcc2 100644
--- a/plugins/builtin/source/content/providers/intel_hex_provider.cpp
+++ b/plugins/builtin/source/content/providers/intel_hex_provider.cpp
@@ -49,7 +49,7 @@ namespace hex::plugin::builtin {
             } recordType;
 
             auto c = [&] {
-                while (std::isspace(string[offset]) && offset < string.length())
+                while (offset < string.length() && std::isspace(string[offset]))
                     offset++;
 
                 if (offset >= string.length())
diff --git a/plugins/builtin/source/content/providers/motorola_srec_provider.cpp b/plugins/builtin/source/content/providers/motorola_srec_provider.cpp
index 6f67c4525..1a24d29f7 100644
--- a/plugins/builtin/source/content/providers/motorola_srec_provider.cpp
+++ b/plugins/builtin/source/content/providers/motorola_srec_provider.cpp
@@ -34,7 +34,7 @@ namespace hex::plugin::builtin {
             std::vector<u8> data;
 
             auto c = [&] {
-                while (std::isspace(string[offset]) && offset < string.length())
+                while (offset < string.length() && std::isspace(string[offset]))
                     offset++;
 
                 if (offset >= string.length())