diff --git a/Kernel/VM/MemoryManager.cpp b/Kernel/VM/MemoryManager.cpp
index b16570150c..2eb472ad7b 100644
--- a/Kernel/VM/MemoryManager.cpp
+++ b/Kernel/VM/MemoryManager.cpp
@@ -21,10 +21,18 @@ MemoryManager& MM
     return *s_the;
 }
 
+void MemoryManager::detect_cpu_features()
+{
+    CPUID extended_processor_info(0x80000001);
+    m_has_nx_support = (extended_processor_info.edx() & (1 << 20)) != 0;
+
+    CPUID extended_features(0x7);
+    m_has_smep_support = (extended_features.ebx() & (1 << 7)) != 0;
+}
+
 MemoryManager::MemoryManager(u32 physical_address_for_kernel_page_tables)
 {
-    CPUID id(0x80000001);
-    m_has_nx_support = (id.edx() & (1 << 20)) != 0;
+    detect_cpu_features();
 
     m_kernel_page_directory = PageDirectory::create_at_fixed_address(PhysicalAddress(physical_address_for_kernel_page_tables));
     for (size_t i = 0; i < 4; ++i) {
@@ -185,6 +193,17 @@ void MemoryManager::initialize_paging()
         "orl $0x20, %eax\n"
         "mov %eax, %cr4\n");
 
+    if (m_has_smep_support) {
+        kprintf("MM: SMEP support detected; enabling\n");
+    // Turn on CR4.SMEP
+    asm volatile(
+        "mov %cr4, %eax\n"
+        "orl $0x100000, %eax\n"
+        "mov %eax, %cr4\n");
+    } else {
+        kprintf("MM: SMEP support not detected\n");
+    }
+
     if (m_has_nx_support) {
         kprintf("MM: NX support detected; enabling NXE flag\n");
 
diff --git a/Kernel/VM/MemoryManager.h b/Kernel/VM/MemoryManager.h
index 574c4984cb..e8bca5248f 100644
--- a/Kernel/VM/MemoryManager.h
+++ b/Kernel/VM/MemoryManager.h
@@ -90,6 +90,7 @@ private:
     void register_region(Region&);
     void unregister_region(Region&);
 
+    void detect_cpu_features();
     void initialize_paging();
     void flush_entire_tlb();
     void flush_tlb(VirtualAddress);
@@ -133,6 +134,7 @@ private:
 
     bool m_quickmap_in_use { false };
     bool m_has_nx_support { false };
+    bool m_has_smep_support { false };
 };
 
 struct ProcessPagingScope {