diff --git a/Kernel/FileSystem/FATFS/FileSystem.cpp b/Kernel/FileSystem/FATFS/FileSystem.cpp
index 9f3c996bf2..bcec7c5492 100644
--- a/Kernel/FileSystem/FATFS/FileSystem.cpp
+++ b/Kernel/FileSystem/FATFS/FileSystem.cpp
@@ -237,7 +237,7 @@ ErrorOr<void> FATFS::initialize_while_locked()
     }
 
     root_entry.attributes = FATAttributes::Directory;
-    m_root_inode = TRY(FATInode::create(*this, root_entry));
+    m_root_inode = TRY(FATInode::create(*this, root_entry, { 0, 1 }));
 
     return {};
 }
diff --git a/Kernel/FileSystem/FATFS/Inode.cpp b/Kernel/FileSystem/FATFS/Inode.cpp
index b21be9b32f..a86d642ba6 100644
--- a/Kernel/FileSystem/FATFS/Inode.cpp
+++ b/Kernel/FileSystem/FATFS/Inode.cpp
@@ -11,15 +11,16 @@
 
 namespace Kernel {
 
-ErrorOr<NonnullRefPtr<FATInode>> FATInode::create(FATFS& fs, FATEntry entry, Vector<FATLongFileNameEntry> const& lfn_entries)
+ErrorOr<NonnullRefPtr<FATInode>> FATInode::create(FATFS& fs, FATEntry entry, FATEntryLocation inode_metadata_location, Vector<FATLongFileNameEntry> const& lfn_entries)
 {
     auto filename = TRY(compute_filename(entry, lfn_entries));
-    return adopt_nonnull_ref_or_enomem(new (nothrow) FATInode(fs, entry, move(filename)));
+    return adopt_nonnull_ref_or_enomem(new (nothrow) FATInode(fs, entry, inode_metadata_location, move(filename)));
 }
 
-FATInode::FATInode(FATFS& fs, FATEntry entry, NonnullOwnPtr<KString> filename)
+FATInode::FATInode(FATFS& fs, FATEntry entry, FATEntryLocation inode_metadata_location, NonnullOwnPtr<KString> filename)
     : Inode(fs, first_cluster(fs.m_fat_version))
     , m_entry(entry)
+    , m_inode_metadata_location(inode_metadata_location)
     , m_filename(move(filename))
 {
     dbgln_if(FAT_DEBUG, "FATFS: Creating inode {} with filename \"{}\"", index(), m_filename);
@@ -160,9 +161,15 @@ ErrorOr<RefPtr<FATInode>> FATInode::traverse(Function<ErrorOr<bool>(RefPtr<FATIn
             dbgln_if(FAT_DEBUG, "FATFS: Invalid cluster for entry");
             return EINVAL;
         } else {
-            dbgln_if(FAT_DEBUG, "FATFS: Found 8.3 entry");
+            auto entry_number_bytes = i * sizeof(FATEntry);
+            auto block = m_block_list[entry_number_bytes / fs().m_device_block_size];
+
+            auto entries_per_sector = fs().m_device_block_size / sizeof(FATEntry);
+            u32 block_entry = i % entries_per_sector;
+
+            dbgln_if(FAT_DEBUG, "FATFS: Found 8.3 entry at block {}, entry {}", block, block_entry);
             lfn_entries.reverse();
-            auto inode = TRY(FATInode::create(fs(), *entry, lfn_entries));
+            auto inode = TRY(FATInode::create(fs(), *entry, { block, block_entry }, lfn_entries));
             if (TRY(callback(inode)))
                 return inode;
             lfn_entries.clear();
diff --git a/Kernel/FileSystem/FATFS/Inode.h b/Kernel/FileSystem/FATFS/Inode.h
index 80a5188848..2a62a40910 100644
--- a/Kernel/FileSystem/FATFS/Inode.h
+++ b/Kernel/FileSystem/FATFS/Inode.h
@@ -16,19 +16,24 @@
 
 namespace Kernel {
 
+struct FATEntryLocation {
+    BlockBasedFileSystem::BlockIndex block;
+    u32 entry;
+};
+
 class FATInode final : public Inode {
     friend FATFS;
 
 public:
     virtual ~FATInode() override = default;
 
-    static ErrorOr<NonnullRefPtr<FATInode>> create(FATFS&, FATEntry, Vector<FATLongFileNameEntry> const& = {});
+    static ErrorOr<NonnullRefPtr<FATInode>> create(FATFS&, FATEntry, FATEntryLocation inode_metadata_location, Vector<FATLongFileNameEntry> const& = {});
 
     FATFS& fs() { return static_cast<FATFS&>(Inode::fs()); }
     FATFS const& fs() const { return static_cast<FATFS const&>(Inode::fs()); }
 
 private:
-    FATInode(FATFS&, FATEntry, NonnullOwnPtr<KString> filename);
+    FATInode(FATFS&, FATEntry, FATEntryLocation inode_metadata_location, NonnullOwnPtr<KString> filename);
 
     // Returns cluster number value that indicates the end of the chain
     // has been reached. Any cluster value >= this value indicates this
@@ -73,6 +78,7 @@ private:
 
     Vector<BlockBasedFileSystem::BlockIndex> m_block_list;
     FATEntry m_entry;
+    FATEntryLocation m_inode_metadata_location;
     NonnullOwnPtr<KString> m_filename;
     InodeMetadata m_metadata;
 };