diff --git a/src/guiengine/scalable_font.cpp b/src/guiengine/scalable_font.cpp
index 9e760f80e..1dc26aa36 100644
--- a/src/guiengine/scalable_font.cpp
+++ b/src/guiengine/scalable_font.cpp
@@ -505,7 +505,7 @@ void ScalableFont::draw(const core::stringw& text,
             c == L'\n'    )        // Unix breaks
         {
             if(c==L'\r' && text[i+1]==L'\n') c = text[++i];
-            offset.Y += MaxHeight;
+            offset.Y += MaxHeight*m_scale;
             offset.X  = position.UpperLeftCorner.X;
             if (hcenter)
                 offset.X += (position.getWidth() - text_dimension.Width) >> 1;
diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index 323980f1f..19fe663e2 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1375,7 +1375,7 @@ void Skin::drawTooltip(Widget* widget)
     irr::gui::ScalableFont* font = GUIEngine::getSmallFont();
     core::dimension2d<u32> size = font->getDimension(widget->getTooltipText().c_str());
     core::position2di pos(widget->m_x + 15, widget->m_y + widget->m_h);
-    core::rect<s32> r(pos, size + core::dimension2d<u32>(0,15));
+    core::rect<s32> r(pos, size);
     GUIEngine::getDriver()->draw2DRectangle( video::SColor(255, 200, 200, 200), r );
     font->draw(widget->getTooltipText(), r, video::SColor(255, 0, 0, 0), false, false);
 }