diff --git a/modules/gui.lua b/modules/gui.lua
index 2e43f4a1..13860efb 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -104,6 +104,10 @@ pfUI:RegisterModule("gui", function ()
 
     for _,frame in pairs(movable) do
       local frame = frame
+      if not frame:IsShown() then
+        frame.hideLater = true
+      end
+
       if not frame.drag then
         frame.drag = CreateFrame("Frame", nil, frame)
         frame.drag:SetAllPoints(frame)
@@ -134,11 +138,15 @@ pfUI:RegisterModule("gui", function ()
         frame:SetMovable(true)
         frame.drag:EnableMouse(true)
         frame.drag:Show()
+        frame:Show()
         pfUI.gui.unlockFrames.text:SetText("Lock Frames")
       else
         frame:SetMovable(false)
         frame.drag:EnableMouse(false)
         frame.drag:Hide()
+        if frame.hideLater == true then
+          frame:Hide()
+        end
         pfUI.gui.unlockFrames.text:SetText("Unlock Frames")
       end
     end
diff --git a/modules/pet.lua b/modules/pet.lua
index 24ec276c..6603ef41 100644
--- a/modules/pet.lua
+++ b/modules/pet.lua
@@ -33,7 +33,15 @@ pfUI:RegisterModule("pet", function ()
   pfUI.uf.pet:RegisterEvent("UNIT_MAXFOCUS")
 
   pfUI.uf.pet:SetScript("OnEvent", function(arg1)
-      if UnitExists("pet") then pfUI.uf.pet:Show() else pfUI.uf.pet:Hide() end
+      if UnitExists("pet") then
+        pfUI.uf.pet:Show()
+      elseif (pfUI.gitter and pfUI.gitter:IsShown()) then
+        pfUI.uf.pet:Show()
+        return
+      else
+        pfUI.uf.pet:Hide()
+      end
+
       local hp, hpmax = UnitHealth("pet"), UnitHealthMax("pet")
       local power, powermax = UnitMana("pet"), UnitManaMax("pet")
 
diff --git a/modules/target.lua b/modules/target.lua
index 66241b80..3c8faf34 100644
--- a/modules/target.lua
+++ b/modules/target.lua
@@ -43,7 +43,12 @@ pfUI:RegisterModule("target", function ()
   pfUI.uf.target:RegisterEvent("UNIT_MAXENERGY")
 
   pfUI.uf.target:SetScript("OnEvent", function()
-      if UnitExists("target") then pfUI.uf.target:Show() else
+      if UnitExists("target") then
+        pfUI.uf.target:Show()
+      elseif (pfUI.gitter and pfUI.gitter:IsShown()) then
+        pfUI.uf.target:Show()
+        return
+      else
         pfUI.uf.target:Hide()
         return
       end
diff --git a/modules/targettarget.lua b/modules/targettarget.lua
index d1da5071..0e54412b 100644
--- a/modules/targettarget.lua
+++ b/modules/targettarget.lua
@@ -1,11 +1,14 @@
 pfUI:RegisterModule("targettarget", function ()
   pfUI.uf.targettargetNotify = CreateFrame("Button",nil,UIParent)
   pfUI.uf.targettargetNotify:SetScript("OnUpdate", function()
-      if UnitExists("targettarget") then pfUI.uf.targettarget:Show() else pfUI.uf.targettarget:Hide() end
+      if UnitExists("targettarget") or (pfUI.gitter and pfUI.gitter:IsShown()) then
+        pfUI.uf.targettarget:Show()
+      else
+        pfUI.uf.targettarget:Hide()
+      end
     end)
 
   pfUI.uf.targettarget = CreateFrame("Button","pfTargetTarget",UIParent)
-  pfUI.uf.targettarget:Hide()
 
   pfUI.uf.targettarget:SetWidth(100)
   pfUI.uf.targettarget:SetHeight(25)
@@ -22,7 +25,15 @@ pfUI:RegisterModule("targettarget", function ()
   pfUI.uf.targettarget.bg:SetAllPoints(pfUI.uf.targettarget)
 
   pfUI.uf.targettarget:SetScript("OnUpdate", function()
-      if not UnitExists("targettarget") then pfUI.uf.targettarget:Hide(); return end
+      if UnitExists("targettarget") then
+        pfUI.uf.targettarget:Show()
+      elseif (pfUI.gitter and pfUI.gitter:IsShown()) then
+        pfUI.uf.targettarget:Show()
+        return
+      else
+        pfUI.uf.targettarget:Hide()
+        return
+      end
 
       local color
       if UnitIsPlayer("targettarget") then