diff --git a/Source/Core/Core/IOS/IOS.cpp b/Source/Core/Core/IOS/IOS.cpp
index 722af814f1..a41effe7b7 100644
--- a/Source/Core/Core/IOS/IOS.cpp
+++ b/Source/Core/Core/IOS/IOS.cpp
@@ -500,9 +500,12 @@ IPCCommandResult Kernel::OpenDevice(OpenRequest& request)
     return Device::Device::GetDefaultReply(IPC_ENOENT);
   }
 
-  const IPCCommandResult result = device->Open(request);
+  IPCCommandResult result = device->Open(request);
   if (result.return_value >= IPC_SUCCESS)
+  {
     m_fdmap[new_fd] = device;
+    result.return_value = new_fd;
+  }
   return result;
 }