diff --git a/api/api.lua b/api/api.lua
index 51adaff6..7b05b7c0 100644
--- a/api/api.lua
+++ b/api/api.lua
@@ -1108,17 +1108,10 @@ end
 function pfUI.api.GetPerfectPixel()
   if pfUI.pixel then return pfUI.pixel end
 
-  local resolution = GetCVar("gxResolution") or ""
-  local _, _, screenheight = strfind(resolution, "x(%d+)")
-  screenheight = tonumber(screenheight)
-
-  if pfUI_config.appearance.border.pixelperfect == "1" and screenheight then
-    -- The uiScale cvar is not a reliable source: it is capped at 1.0 while both
-    -- the pixelperfect module and the firstrun slider push UIParent past it via
-    -- SetScale, and it is ignored completely while useUiScale is off. Ask the
-    -- frame itself instead, it always reports what is really on screen.
-    local scale = UIParent:GetEffectiveScale()
-    if not scale or scale <= 0 then scale = 1 end
+  if pfUI_config.appearance.border.pixelperfect == "1" then
+    local scale = GetCVar("useUiScale") == "1" and GetCVar("uiScale") or "1"
+    local resolution = GetCVar("gxResolution")
+    local _, _, screenwidth, screenheight = strfind(resolution, "(.+)x(.+)")
 
     pfUI.pixel = 768 / screenheight / scale
     pfUI.pixel = pfUI.pixel > 1 and 1 or pfUI.pixel
diff --git a/init/modules.xml b/init/modules.xml
index e7a32b38..c9b0069f 100644
--- a/init/modules.xml
+++ b/init/modules.xml
@@ -1,7 +1,4 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
-  <!-- pixelperfect must load first: it sets the UI scale that GetPerfectPixel
-       measures a real pixel against, and that value is cached on first use. -->
-  <Include file="..\modules\pixelperfect.lua"/>
   <Include file="..\modules\gui.lua"/>
   <Include file="..\modules\unlock.lua"/>
   <Include file="..\modules\hoverbind.lua"/>
@@ -56,6 +53,7 @@
   <Include file="..\modules\gm.lua"/>
   <Include file="..\modules\mirrortimers.lua"/>
   <Include file="..\modules\feigndeath.lua"/>
+  <Include file="..\modules\pixelperfect.lua"/>
   <Include file="..\modules\hdgraphic.lua"/>
   <Include file="..\modules\share.lua"/>
   <Include file="..\modules\tracking.lua"/>