diff --git a/apps/openmw/mwgui/map_window.cpp b/apps/openmw/mwgui/map_window.cpp
index 52b108f85..d0f3f921e 100644
--- a/apps/openmw/mwgui/map_window.cpp
+++ b/apps/openmw/mwgui/map_window.cpp
@@ -190,8 +190,8 @@ void LocalMapBase::setActiveCell(const int x, const int y, bool interior)
                     widgetCoord, MyGUI::Align::Default, "Marker" + boost::lexical_cast<std::string>(counter));
                 markerWidget->setImageResource("DoorMarker");
                 markerWidget->setUserString("ToolTipType", "Layout");
-                markerWidget->setUserString("ToolTipLayout", "TextToolTip");
-                markerWidget->setUserString("Caption_Text", marker.name);
+                markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
+                markerWidget->setUserString("Caption_TextOneLine", marker.name);
                 markerWidget->setUserString("IsMarker", "true");
                 markerWidget->eventMouseSetFocus += MyGUI::newDelegate(this, &LocalMapBase::onMarkerFocused);
                 markerWidget->eventMouseLostFocus += MyGUI::newDelegate(this, &LocalMapBase::onMarkerUnfocused);
@@ -323,16 +323,16 @@ void MapWindow::addVisitedLocation(const std::string& name, int x, int y)
         widgetCoord, MyGUI::Align::Default, "Marker" + boost::lexical_cast<std::string>(_counter));
     markerWidget->setImageResource("DoorMarker");
     markerWidget->setUserString("ToolTipType", "Layout");
-    markerWidget->setUserString("ToolTipLayout", "TextToolTip");
-    markerWidget->setUserString("Caption_Text", name);
+    markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
+    markerWidget->setUserString("Caption_TextOneLine", name);
     ++_counter;
 
     markerWidget = mEventBoxGlobal->createWidget<MyGUI::Button>("",
         widgetCoord, MyGUI::Align::Default);
     markerWidget->setNeedMouseFocus (true);
     markerWidget->setUserString("ToolTipType", "Layout");
-    markerWidget->setUserString("ToolTipLayout", "TextToolTip");
-    markerWidget->setUserString("Caption_Text", name);
+    markerWidget->setUserString("ToolTipLayout", "TextToolTipOneLine");
+    markerWidget->setUserString("Caption_TextOneLine", name);
 }
 
 void MapWindow::cellExplored(int x, int y)
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index f554e2b0d..7291f2ca2 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -7,7 +7,17 @@
         <Widget type="Widget" skin="HUD_Box_NoTransp" position="0 0 300 300" align="Stretch" name="DynamicToolTipBox">
         </Widget>
 
-        <!-- Text tooltip -->
+        <!-- Text tooltip, one line -->
+        <Widget type="VBox" skin="HUD_Box_NoTransp" position="0 0 300 300" align="Stretch" name="TextToolTipOneLine">
+            <Property key="AutoResize" value="true"/>
+            <Property key="Padding" value="8"/>
+
+            <Widget type="AutoSizedTextBox" skin="SandText" position="8 8 284 284" align="Left Top" name="TextOneLine">
+                <Property key="TextAlign" value="Left Top"/>
+            </Widget>
+        </Widget>
+
+        <!-- Text tooltip, multiline -->
         <Widget type="VBox" skin="HUD_Box_NoTransp" position="0 0 300 300" align="Stretch" name="TextToolTip">
             <Property key="AutoResize" value="true"/>
             <Property key="Padding" value="8"/>
@@ -106,12 +116,14 @@
                 <Widget type="ImageBox" skin="ImageBox" position="8 8 32 32" align="Left Top" name="SkillImage"/>
 
                 <Widget type="VBox">
-                    <Widget type="AutoSizedEditBox" skin="NormalText" position="44 8 252 16" align="Left Top" name="SkillName">
+                    <Widget type="AutoSizedTextBox" skin="NormalText" position="44 8 252 16" align="Left Top" name="SkillName">
                         <Property key="TextAlign" value="Left"/>
+                        <UserString key="HStretch" value="true"/>
                     </Widget>
 
-                    <Widget type="AutoSizedEditBox" skin="SandText" position="44 24 252 16" align="Left Top" name="SkillAttribute">
+                    <Widget type="AutoSizedTextBox" skin="SandText" position="44 24 252 16" align="Left Top" name="SkillAttribute">
                         <Property key="TextAlign" value="Left"/>
+                        <UserString key="HStretch" value="true"/>
                     </Widget>
                 </Widget>
             </Widget>
@@ -147,10 +159,12 @@
                 <Widget type="VBox">
                     <Widget type="AutoSizedEditBox" skin="NormalText" position="44 8 252 16" align="Left Top" name="SkillNoProgressName">
                         <Property key="TextAlign" value="Left"/>
+                        <UserString key="HStretch" value="true"/>
                     </Widget>
 
-                    <Widget type="AutoSizedEditBox" skin="SandText" position="44 24 252 16" align="Left Top" name="SkillNoProgressAttribute">
+                    <Widget type="AutoSizedTextBox" skin="SandText" position="44 24 252 16" align="Left Top" name="SkillNoProgressAttribute">
                         <Property key="TextAlign" value="Left"/>
+                        <UserString key="HStretch" value="true"/>
                     </Widget>
                 </Widget>
             </Widget>
@@ -200,17 +214,23 @@
             <Property key="Padding" value="8"/>
 
             <Widget type="HBox">
+                <UserString key="HStretch" value="true"/>
+
                 <Widget type="ImageBox" skin="ImageBox" position="8 8 32 32" align="Left Top" name="MagicEffectImage"/>
 
                 <Widget type="VBox">
-                    <Widget type="AutoSizedEditBox" skin="NormalText" position="44 8 252 16" align="Left Top" name="MagicEffectName">
+                    <Widget type="AutoSizedTextBox" skin="NormalText" position="44 8 252 16" align="Left Top" name="MagicEffectName">
                         <Property key="TextAlign" value="Left"/>
+                        <UserString key="HStretch" value="true"/>
                     </Widget>
 
-                    <Widget type="AutoSizedEditBox" skin="SandText" position="44 24 252 16" align="Left Top" name="MagicEffectSchool">
+
+                    <Widget type="AutoSizedTextBox" skin="SandText" position="44 24 252 16" align="Left Top" name="MagicEffectSchool">
                         <Property key="TextAlign" value="Left"/>
+                        <UserString key="HStretch" value="true"/>
                     </Widget>
                 </Widget>
+
             </Widget>
 
             <Widget type="AutoSizedEditBox" skin="SandText" position="8 44 284 0" align="Left Top" name="MagicEffectDescription">