diff --git a/modules/skin.lua b/modules/skin.lua
index dff02f8b..6a0654db 100644
--- a/modules/skin.lua
+++ b/modules/skin.lua
@@ -47,15 +47,9 @@ pfUI:RegisterModule("skin", function ()
     "GameMenuButtonLogout",
     "GameMenuButtonQuit",
     "GameMenuButtonContinue",
-    "StaticPopup1Button1",
-    "StaticPopup1Button2",
-    "StaticPopup2Button1",
-    "StaticPopup2Button2",
   }
 
   local boxes = {
-    "StaticPopup1",
-    "StaticPopup2",
     "GameMenuFrame",
     "DropDownList1MenuBackdrop",
     "DropDownList2MenuBackdrop",
@@ -63,11 +57,6 @@ pfUI:RegisterModule("skin", function ()
     "DropDownList2Backdrop",
   }
 
-  local editboxes = {
-    "StaticPopup1EditBox",
-    "StaticPopup1WideEditBox",
-  }
-
   GameMenuFrameHeader:SetTexture(nil)
   GameMenuFrame:SetHeight(GameMenuFrame:GetHeight()+2)
   GameMenuFrame:SetWidth(GameMenuFrame:GetWidth()-30)
@@ -93,13 +82,6 @@ pfUI:RegisterModule("skin", function ()
     CreateBackdrop(b, nil, true, .8)
   end
 
-  for _, edit in pairs(editboxes) do
-    local b = getglobal(edit)
-    b:SetHeight(20)
-    StripTextures(b)
-    CreateBackdrop(b, nil, true, .8)
-  end
-
   for i,v in ipairs({GameMenuFrame:GetRegions()}) do
     if v.SetTextColor then
       v:SetTextColor(1,1,1,1)
diff --git a/pfUI.toc b/pfUI.toc
index cd6d3f2e..a9584bfe 100644
--- a/pfUI.toc
+++ b/pfUI.toc
@@ -68,6 +68,7 @@ skins\blizzard\battlefield_minimap.lua
 skins\blizzard\GMSurvey.lua
 skins\blizzard\keybindings.lua
 skins\blizzard\merchant.lua
+skins\blizzard\popup_dialogs.lua
 
 # modules
 modules\gui.lua
diff --git a/skins/blizzard/popup_dialogs.lua b/skins/blizzard/popup_dialogs.lua
new file mode 100644
index 00000000..69c4a367
--- /dev/null
+++ b/skins/blizzard/popup_dialogs.lua
@@ -0,0 +1,23 @@
+pfUI:RegisterSkin("StaticPopupDialogs", function ()
+  for i = 1, STATICPOPUP_NUMDIALOGS do
+    local dialog = _G["StaticPopup"..i]
+
+    CreateBackdrop(dialog, nil, true, .75)
+    SkinCloseButton(_G[dialog:GetName().."CloseButton"], dialog, -6, -6)
+
+    SkinButton(_G[dialog:GetName().."Button1"])
+    SkinButton(_G[dialog:GetName().."Button2"])
+
+    local editbox = _G[dialog:GetName().."EditBox"]
+    editbox:DisableDrawLayer("BACKGROUND")
+    CreateBackdrop(editbox)
+    editbox:SetHeight(18)
+
+    local wide_editbox = _G[dialog:GetName().."WideEditBox"]
+    wide_editbox:DisableDrawLayer("BACKGROUND")
+    CreateBackdrop(wide_editbox)
+    wide_editbox:SetHeight(18)
+    wide_editbox:ClearAllPoints()
+    wide_editbox:SetPoint("BOTTOM", 0, 45)
+  end
+end)