diff --git a/consolemenu/menu_component.py b/consolemenu/menu_component.py
index <HASH>..<HASH> 100644
--- a/consolemenu/menu_component.py
+++ b/consolemenu/menu_component.py
@@ -192,7 +192,7 @@ class MenuComponent(object):
                 # apply indentation to any lines after the first that were split by a users newline
                 line = indent + line
             # apply any wrapping and indentation if the line is still too long
-            wrapped = textwrap.wrap(line, width=self.calculate_content_width(), subsequent_indent=indent)
+            wrapped = ansiwrap.wrap(line, width=self.calculate_content_width(), subsequent_indent=indent)
             for wrapline in wrapped:
                 # Finally, this adds the borders and things to the string
                 # TODO: check compatability on super() calls
@@ -270,8 +270,7 @@ class MenuTextSection(MenuComponent):
         for x in range(0, self.padding.top):
             yield self.row()
         if self.text is not None and self.text != '':
-            for line in ansiwrap.wrap(self.text, width=self.calculate_content_width()):
-                yield self.row(content=line, align=self.text_align)
+            yield self.row(content=self.text, align=self.text_align)
         for x in range(0, self.padding.bottom):
             yield self.row()
         if self.show_bottom_border:
text wrapping and ascii handling is now handled within the row function