diff --git a/src/memory/paging/table.rs b/src/memory/paging/table.rs
index ec370894..f94afc42 100644
--- a/src/memory/paging/table.rs
+++ b/src/memory/paging/table.rs
@@ -31,6 +31,15 @@ where
     }
 }
 
+/*
+ * Addresses are expected to be canonical (bits 48-63 must be the same as bit 47), otherwise the
+ * CPU will #GP when we ask it to translate it.
+ */
+fn make_address_canonical(address : usize) -> usize {
+    let sign_extension = 0o177777_000_000_000_000_0000 * ((address >> 47) & 0b1);
+    (address & ((1 << 48) - 1)) | sign_extension
+}
+
 impl<L> Table<L>
 where
     L: HierarchicalLevel,
@@ -39,7 +48,7 @@ where
         let entry_flags = self[index].flags();
         if entry_flags.contains(PRESENT) && !entry_flags.contains(HUGE_PAGE) {
             let table_address = self as *const _ as usize;
-            Some((table_address << 9) | (index << 12))
+            Some(make_address_canonical((table_address << 9) | (index << 12)))
         } else {
             None
         }