diff --git a/api/config.lua b/api/config.lua
index 10301524..10d7536a 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -726,6 +726,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("bars",       nil,           "nacolor",          ".3,.3,.3,1")
   pfUI:UpdateConfig("bars",       nil,           "showequipped",     "1")
   pfUI:UpdateConfig("bars",       nil,           "eqcolor",          ".2,.8,.2,.2")
+  pfUI:UpdateConfig("bars",       nil,           "shiftdrag",        "1")
 
   pfUI:UpdateConfig("bars",       nil,           "font",             "Interface\\AddOns\\pfUI\\fonts\\BigNoodleTitling.ttf")
   pfUI:UpdateConfig("bars",       nil,           "font_offset",      "0")
diff --git a/modules/actionbar.lua b/modules/actionbar.lua
index f12569a1..990b9b94 100644
--- a/modules/actionbar.lua
+++ b/modules/actionbar.lua
@@ -401,7 +401,7 @@ pfUI:RegisterModule("actionbar", 20400, function ()
   local function ButtonDrag(self)
     local self = self or this
 
-    if _G.LOCK_ACTIONBAR == "1" then return end
+    if _G.LOCK_ACTIONBAR == "1" and not (pfUI_config.bars.shiftdrag == "1" and IsShiftKeyDown()) then return end
 
     if self.bar == 12 then
       PickupPetAction(self.id)
diff --git a/modules/gui.lua b/modules/gui.lua
index 662dd1db..cea523c4 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -1663,6 +1663,7 @@ pfUI:RegisterModule("gui", 20400, function ()
       CreateConfig(U["bars"], T["Highlight Not Usable Spells"], C.bars, "showna", "checkbox")
       CreateConfig(U["bars"], T["Not Usable Color"], C.bars, "nacolor", "color")
       CreateConfig(U["bars"], T["Lock Actionbars"], "UVAR", "LOCK_ACTIONBAR", "checkbox")
+      CreateConfig(U["bars"], T["Always Allow Drag Via Shift Key"], C.bars, "shiftdrag", "checkbox")
 
       CreateConfig(nil, "Font Options", nil, nil, "header")
       CreateConfig(U["bars"], T["Font"], C.bars, "font", "dropdown", pfUI.gui.dropdowns.fonts)