diff --git a/scene/game_config.lua b/scene/game_config.lua
index 1fe67e8..f1edd74 100644
--- a/scene/game_config.lua
+++ b/scene/game_config.lua
@@ -6,7 +6,7 @@ require 'load.save'
 
 ConfigScene.options = {
     -- this serves as reference to what the options' values mean i guess?
-    {"manlock",      "Manual locking", {"Per gamemode","Per ruleset","Harddrop", "Softdrop"}},
+    {"manlock",      "Manual locking", {"Per ruleset","Per gamemode","Harddrop", "Softdrop"}},
     {"piece_colour", "Piece Colours",  {"Per ruleset", "Arika",      "TTC"}},
     {"world_reverse", "World Reverse", {"No",          "Yes"}},
 }
diff --git a/tetris/modes/gamemode.lua b/tetris/modes/gamemode.lua
index 5ceeb62..ce11b39 100644
--- a/tetris/modes/gamemode.lua
+++ b/tetris/modes/gamemode.lua
@@ -76,8 +76,8 @@ function GameMode:initialize(ruleset)
 	for i = 1, self.next_queue_length do
 		table.insert(self.next_queue, self:getNextPiece(ruleset))
 	end
-    self.lock_on_soft_drop = ({self.instant_soft_drop, ruleset.softdrop_lock, false, true })[config.gamesettings.manlock]
-    self.lock_on_hard_drop = ({self.instant_hard_drop, ruleset.harddrop_lock, true,  false})[config.gamesettings.manlock]
+    self.lock_on_soft_drop = ({ruleset.softdrop_lock, self.instant_soft_drop, false, true })[config.gamesettings.manlock]
+    self.lock_on_hard_drop = ({ruleset.harddrop_lock, self.instant_hard_drop, true,  false})[config.gamesettings.manlock]
 end
 
 function GameMode:update(inputs, ruleset)