diff --git a/Userland/Applications/HexEditor/HexDocument.cpp b/Userland/Applications/HexEditor/HexDocument.cpp
index ce98bc65af..e7e49c6c19 100644
--- a/Userland/Applications/HexEditor/HexDocument.cpp
+++ b/Userland/Applications/HexEditor/HexDocument.cpp
@@ -72,8 +72,7 @@ ErrorOr<void> HexDocumentMemory::write_to_file(Core::Stream::File& file)
 ErrorOr<NonnullOwnPtr<HexDocumentFile>> HexDocumentFile::create(NonnullOwnPtr<Core::Stream::File> file)
 {
     auto document = TRY(adopt_nonnull_own_or_enomem(new HexDocumentFile(move(file))));
-    // FIXME: Remove this hackery
-    TRY(document->set_file(move(document->m_file)));
+    TRY(document->initialize_internal_state());
 
     return document;
 }
@@ -153,7 +152,12 @@ void HexDocumentFile::clear_changes()
 ErrorOr<void> HexDocumentFile::set_file(NonnullOwnPtr<Core::Stream::File> file)
 {
     m_file = move(file);
+    TRY(initialize_internal_state());
+    return {};
+}
 
+ErrorOr<void> HexDocumentFile::initialize_internal_state()
+{
     if (auto result = m_file->seek(0, SeekMode::FromEndPosition); result.is_error())
         m_file_size = 0;
     else
diff --git a/Userland/Applications/HexEditor/HexDocument.h b/Userland/Applications/HexEditor/HexDocument.h
index 3f19b8f3e6..6a5f7943cc 100644
--- a/Userland/Applications/HexEditor/HexDocument.h
+++ b/Userland/Applications/HexEditor/HexDocument.h
@@ -76,6 +76,8 @@ public:
 
 private:
     explicit HexDocumentFile(NonnullOwnPtr<Core::Stream::File> file);
+    ErrorOr<void> initialize_internal_state();
+
     void ensure_position_in_buffer(size_t position);
 
     NonnullOwnPtr<Core::Stream::File> m_file;