diff --git a/ElvUI/Modules/Skins/Blizzard/Debug.lua b/ElvUI/Modules/Skins/Blizzard/Debug.lua
index 73ab5ce..44bbca3 100644
--- a/ElvUI/Modules/Skins/Blizzard/Debug.lua
+++ b/ElvUI/Modules/Skins/Blizzard/Debug.lua
@@ -45,8 +45,19 @@ local function LoadSkin()
 	S:HandleNextPrevButton(ScriptErrorsFrame.next)
 	S:HandleButton(ScriptErrorsFrame.close)
 
-	S:HandleButton(ScriptErrorsFrame.close)
+	local function SkinFirstLast()
+		S:HandleButton(ScriptErrorsFrame.firstButton)
+		S:HandleButton(ScriptErrorsFrame.lastButton)
+	end
 
+	local DT = E:GetModule("DebugTools")
+	if DT.HideFrame then
+		SkinFirstLast()
+	else
+		hooksecurefunc(DT, "ModifyErrorFrame", SkinFirstLast)
+	end
+
+	-- TODO FIX HandleNextPrevButton button size
 	E:Point(ScriptErrorsFrame.reload, "BOTTOMLEFT", 12, 8)
 	E:Point(ScriptErrorsFrame.previous, "BOTTOM", ScriptErrorsFrame, "BOTTOM", -50, 7)
 	E:Point(ScriptErrorsFrame.next, "BOTTOM", ScriptErrorsFrame, "BOTTOM", 50, 7)
diff --git a/ElvUI/Modules/Skins/Blizzard/Misc.lua b/ElvUI/Modules/Skins/Blizzard/Misc.lua
index 4c44a89..0282cee 100644
--- a/ElvUI/Modules/Skins/Blizzard/Misc.lua
+++ b/ElvUI/Modules/Skins/Blizzard/Misc.lua
@@ -277,6 +277,7 @@ local function LoadSkin()
 		E:SetTemplate(options, "Transparent")
 	end
 
+	BasicOptions:EnableMouse(true)
 	BasicOptions.backdrop = CreateFrame("Frame", nil, BasicOptions)
 	E:Point(BasicOptions.backdrop, "TOPLEFT", BasicOptionsGeneral, -20, 35)
 	E:Point(BasicOptions.backdrop, "BOTTOMRIGHT", BasicOptionsHelp, 20, -130)