Index: binaries/data/mods/public/gui/session/minimap/MiniMap.xml
===================================================================
--- binaries/data/mods/public/gui/session/minimap/MiniMap.xml
+++ binaries/data/mods/public/gui/session/minimap/MiniMap.xml
@@ -5,7 +5,7 @@
 	type="image"
 >
 	<!-- MiniMap -->
-	<object name="minimap" size="8 8 100%-8 100%-8" type="minimap" z="20" mask="true"/>
+	<object name="minimap" size="8 8 100%-8 100%-8" type="minimap" mask="true"/>
 
 	<!-- Background image -->
 	<object
Index: source/gui/CGUI.cpp
===================================================================
--- source/gui/CGUI.cpp
+++ source/gui/CGUI.cpp
@@ -25,6 +25,8 @@
 #include "gui/Scripting/ScriptFunctions.h"
 #include "gui/Scripting/JSInterface_GUIProxy.h"
 #include "i18n/L10n.h"
+#include "lib/allocators/DynamicArena.h"
+#include "lib/allocators/STLAllocators.h"
 #include "lib/bits.h"
 #include "lib/input.h"
 #include "lib/sysdep/sysdep.h"
@@ -65,6 +67,24 @@
 const CStr CGUI::EventNameMouseRightDoubleClick = "MouseRightDoubleClick";
 const CStr CGUI::EventNameMouseRightRelease = "MouseRightRelease";
 
+namespace
+{
+
+template<class Container>
+void CollectVisibleObjectsRecursively(const std::vector<IGUIObject*>& objects, Container* visibleObjects)
+{
+	for (IGUIObject* const& object : objects)
+	{
+		if (!object->IsHidden())
+		{
+			visibleObjects->emplace_back(object);
+			CollectVisibleObjectsRecursively(object->GetChildren(), visibleObjects);
+		}
+	}
+}
+
+} // anonynous namespace
+
 CGUI::CGUI(const shared_ptr<ScriptContext>& context)
 	: m_BaseObject(std::make_unique<CGUIDummyObject>(*this)),
 	  m_FocusedObject(nullptr),
@@ -302,7 +322,20 @@
 	// drawn on top of everything else
 	glClear(GL_DEPTH_BUFFER_BIT);
 
-	m_BaseObject->RecurseObject(&IGUIObject::IsHidden, &IGUIObject::Draw);
+	using Arena = Allocators::DynamicArena<128 * KiB>;
+	using ObjectListAllocator = ProxyAllocator<IGUIObject*, Arena>;
+	Arena arena;
+
+	std::vector<IGUIObject*, ObjectListAllocator> visibleObjects((ObjectListAllocator(arena)));
+	CollectVisibleObjectsRecursively(m_BaseObject->GetChildren(), &visibleObjects);
+
+	std::sort(visibleObjects.begin(), visibleObjects.end(), [](const IGUIObject* object1, const IGUIObject* object2) -> bool {
+		if (object1->GetBufferedZ() != object2->GetBufferedZ())
+			return object1->GetBufferedZ() < object2->GetBufferedZ();
+		return object1 < object2;
+	});
+	for (IGUIObject* const& object : visibleObjects)
+		object->Draw();
 }
 
 void CGUI::DrawSprite(const CGUISpriteInstance& Sprite, const float& Z, const CRect& Rect, const CRect& UNUSED(Clipping))
Index: source/gui/ObjectTypes/CTooltip.h
===================================================================
--- source/gui/ObjectTypes/CTooltip.h
+++ source/gui/ObjectTypes/CTooltip.h
@@ -50,6 +50,8 @@
 
 	virtual void Draw();
 
+	virtual float GetBufferedZ() const;
+
 	// Settings
 	float m_BufferZone;
 	CGUIString m_Caption;
Index: source/gui/ObjectTypes/CTooltip.cpp
===================================================================
--- source/gui/ObjectTypes/CTooltip.cpp
+++ source/gui/ObjectTypes/CTooltip.cpp
@@ -147,8 +147,6 @@
 
 void CTooltip::Draw()
 {
-	float z = 900.f; // TODO: Find a nicer way of putting the tooltip on top of everything else
-
 	// Normally IGUITextOwner will handle this updating but since SetupText can modify the position
 	// we need to call it now *before* we do the rest of the drawing
 	if (!m_GeneratedTextsValid)
@@ -157,7 +155,13 @@
 		m_GeneratedTextsValid = true;
 	}
 
-	m_pGUI.DrawSprite(m_Sprite, z, m_CachedActualSize);
+	m_pGUI.DrawSprite(m_Sprite, GetBufferedZ(), m_CachedActualSize);
+
+	DrawText(0, m_TextColor, m_CachedActualSize.TopLeft(), GetBufferedZ() + 0.1f);
+}
 
-	DrawText(0, m_TextColor, m_CachedActualSize.TopLeft(), z + 0.1f);
+float CTooltip::GetBufferedZ() const
+{
+	// TODO: Find a nicer way of putting the tooltip on top of everything else.
+	return 900.f;
 }