diff --git a/src/data/etc/keymaps/Dvorak.keymap b/src/data/etc/keymaps/Dvorak.keymap
index c97840b80e..6429f5a25c 100644
--- a/src/data/etc/keymaps/Dvorak.keymap
+++ b/src/data/etc/keymaps/Dvorak.keymap
@@ -40,11 +40,11 @@ NumLock = 0x22
 LShift = 0x4b
 RShift = 0x56
 LCommand = 0x5d
-RCommand = 0x00
+RCommand = 0x5f
 LControl = 0x5c
 RControl = 0x60
 LOption = 0x66
-ROption = 0x5f
+ROption = 0x67
 Menu = 0x68
 #
 # Lock settings