diff --git a/PySimpleGUI.py b/PySimpleGUI.py
index af1f94a3..a45a5325 100644
--- a/PySimpleGUI.py
+++ b/PySimpleGUI.py
@@ -5183,11 +5183,11 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
                 tktext_label = element.Widget = tk.Label(tk_row_frame, textvariable=stringvar, width=width,
                                                          height=height, justify=justify, bd=border_depth, font=font)
                 # Set wrap-length for text (in PIXELS) == PAIN IN THE ASS
-                wraplen = tktext_label.winfo_reqwidth() - 10   # width of widget in Pixels
+                wraplen = 0
                 if not auto_size_text and height == 1:
                     wraplen = 0
-                else:
-                    wraplen = width
+                elif not auto_size_text:
+                    wraplen = tktext_label.winfo_reqwidth() - 10   # width of widget in Pixels
                 tktext_label.configure(anchor=anchor, wraplen=wraplen)  # set wrap to width of widget
                 if element.Relief is not None:
                     tktext_label.configure(relief=element.Relief)