2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 87e89591f..9417f5214 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -189,6 +189,8 @@ ChatWindow::ChatWindow():
     setMinWidth(150);
     setMinHeight(90);
 
+    setTitleBarHeight(getPadding() + getTitlePadding());
+
     mChatTabs->enableScrollButtons(true);
     mChatTabs->setFollowDownScroll(true);
 
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index ccbbf2059..c7bc1b5f1 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -133,8 +133,8 @@ class SocialGuildTab : public SocialTab, public gcn::ActionListener
 {
 public:
     SocialGuildTab(Guild *const guild, const bool showBackground) :
-        ActionListener(),
         SocialTab(),
+        ActionListener(),
         mGuild(guild)
     {
         setCaption(_("Guild"));