diff --git a/modules/game_battle/battle.lua b/modules/game_battle/battle.lua
index 0c8e6869..af75b41e 100644
--- a/modules/game_battle/battle.lua
+++ b/modules/game_battle/battle.lua
@@ -49,6 +49,9 @@ function init()
   mouseWidget:setVisible(false)
   mouseWidget:setFocusable(false)
 
+  battleWindow:setContentMinimumHeight(56)
+  battleWindow:setContentMaximumHeight(384)
+
   connect(Creature, { onSkullChange = checkCreatureSkull,
                       onEmblemChange = checkCreatureEmblem,
                       onHealthPercentChange = onCreatureHealthPercentChange,
diff --git a/modules/game_containers/containers.lua b/modules/game_containers/containers.lua
index 950a3458..1e1031f5 100644
--- a/modules/game_containers/containers.lua
+++ b/modules/game_containers/containers.lua
@@ -93,7 +93,11 @@ function onContainerOpen(container, previousContainer)
   local cellSize = layout:getCellSize()
   containerWindow:setContentMinimumHeight(cellSize.height*1)
   containerWindow:setContentMaximumHeight(cellSize.height*layout:getNumLines())
-  containerWindow:setContentHeight(3*cellSize.height/2)
+
+  if not previousContainer then
+    local filledLines = math.max(math.ceil(container:getItemsCount() / layout:getNumColumns()), 1)
+    containerWindow:setContentHeight(filledLines*cellSize.height)
+  end
 end
 
 function onContainerClose(container)
diff --git a/modules/game_minimap/minimap.lua b/modules/game_minimap/minimap.lua
index eb03597c..3e4ea5bb 100644
--- a/modules/game_minimap/minimap.lua
+++ b/modules/game_minimap/minimap.lua
@@ -25,6 +25,8 @@ function init()
   minimapButton:setOn(true)
 
   minimapWindow = g_ui.loadUI('minimap.otui', modules.game_interface.getRightPanel())
+  minimapWindow:setContentMinimumHeight(64)
+  minimapWindow:setContentMaximumHeight(256)
 
   minimapWidget = minimapWindow:recursiveGetChildById('minimap')
   g_mouse.bindAutoPress(minimapWidget, compassClick, nil, MouseRightButton)
diff --git a/modules/game_skills/skills.lua b/modules/game_skills/skills.lua
index 3997317e..e2ef3470 100644
--- a/modules/game_skills/skills.lua
+++ b/modules/game_skills/skills.lua
@@ -164,6 +164,10 @@ function refresh()
   end
 
   update()
+
+  local contentsPanel = skillsWindow:getChildById('contentsPanel')
+  skillsWindow:setContentMinimumHeight(44)
+  skillsWindow:setContentMaximumHeight(contentsPanel:getChildrenRect().height)
 end
 
 function toggle()
diff --git a/modules/game_viplist/viplist.lua b/modules/game_viplist/viplist.lua
index 3de10d0e..de3708b0 100644
--- a/modules/game_viplist/viplist.lua
+++ b/modules/game_viplist/viplist.lua
@@ -32,6 +32,9 @@ function refresh()
   for id,vip in pairs(g_game.getVips()) do
     onAddVip(id, unpack(vip))
   end
+
+  vipWindow:setContentMinimumHeight(38)
+  vipWindow:setContentMaximumHeight(256)
 end
 
 function clear()