diff --git a/PySimpleGUI.py b/PySimpleGUI.py
index 6eeb09c2..2ad35d75 100644
--- a/PySimpleGUI.py
+++ b/PySimpleGUI.py
@@ -3596,18 +3596,6 @@ class TabGroup(Element):
                     return element.Key
         return None
 
-    # def SelectTab(self, index):
-    #     """
-    #     Create a tkinter event that mimics user clicking on a tab. Must have called window.Finalize / Read first!
-    #
-    #     :param index: (int) indicates which Tab should be selected. Count starts at 0
-    #     """
-    #
-    #     try:
-    #         self.TKNotebook.select(index)
-    #     except Exception as e:
-    #         print('Exception Selecting Tab {}'.format(e))
-    #
 
     def Get(self):
         """
@@ -3628,19 +3616,6 @@ class TabGroup(Element):
             value = None
         return value
 
-    #
-    # def GetCurrentlySelectedTabIndex(self):
-    #     """
-    #     Returns the "index" of the currently selected tab in this TabGroup.  Indexes start at 0. Returns None if there is an error.
-    #
-    #     :return: Union[int, None] The index number of the currently selected tab or None if there was a problem
-    #     """
-    #     try:
-    #         index = self.TKNotebook.index('current')
-    #     except:
-    #         index = None
-    #     return index
-
 
     def __del__(self):
         """ """
@@ -5062,11 +5037,11 @@ class Window:
         self.TransparentColor = transparent_color
         self.UniqueKeyCounter = 0
         self.DebuggerEnabled = debugger_enabled
-
+        self.WasClosed = False
         if type(title) != str:
             warnings.warn('Your title is not a string.  Are you passing in the right parameters?', UserWarning)
-        if layout is not None and type(layout) != list:
-            warnings.warn('Your layout is not a list... this is not good!')
+        if layout is not None and type(layout) not in  (list, tuple):
+            warnings.warn('Your layout is not a list or tuple... this is not good!')
 
         if layout is not None:
             self.Layout(layout)
@@ -7070,30 +7045,38 @@ def _FindElementWithFocusInSubForm(form):
                 matching_elem = _FindElementWithFocusInSubForm(element)
                 if matching_elem is not None:
                     return matching_elem
-            if element.Type == ELEM_TYPE_FRAME:
+            elif element.Type == ELEM_TYPE_FRAME:
                 matching_elem = _FindElementWithFocusInSubForm(element)
                 if matching_elem is not None:
                     return matching_elem
-            if element.Type == ELEM_TYPE_TAB_GROUP:
+            elif element.Type == ELEM_TYPE_TAB_GROUP:
                 matching_elem = _FindElementWithFocusInSubForm(element)
                 if matching_elem is not None:
                     return matching_elem
-            if element.Type == ELEM_TYPE_TAB:
+            elif element.Type == ELEM_TYPE_TAB:
                 matching_elem = _FindElementWithFocusInSubForm(element)
                 if matching_elem is not None:
                     return matching_elem
-            if element.Type == ELEM_TYPE_INPUT_TEXT:
+            elif element.Type == ELEM_TYPE_INPUT_TEXT:
                 if element.TKEntry is not None:
                     if element.TKEntry is element.TKEntry.focus_get():
                         return element
-            if element.Type == ELEM_TYPE_INPUT_MULTILINE:
+            elif element.Type == ELEM_TYPE_INPUT_MULTILINE:
                 if element.TKText is not None:
                     if element.TKText is element.TKText.focus_get():
                         return element
-            if element.Type == ELEM_TYPE_BUTTON:
+            elif element.Type == ELEM_TYPE_BUTTON:
                 if element.TKButton is not None:
                     if element.TKButton is element.TKButton.focus_get():
                         return element
+            else:       # The "Catch All" - if type isn't one of the above, try generic element.Widget
+                try:
+                    if element.Widget is not None:
+                        if element.Widget is element.Widget.focus_get():
+                            return element
+                except:
+                    return None
+
     return None
 
 if sys.version_info[0] >= 3:
@@ -9735,8 +9718,6 @@ def MsgBox(*args):
 
 
 
-
-
 # ========================  Scrolled Text Box   =====#
 # ===================================================#
 def PopupScrolled(*args,  title=None, button_color=None, yes_no=False, auto_close=False, auto_close_duration=None, size=(None, None),
@@ -11144,6 +11125,7 @@ def main():
         elif event == 'Normal':
             window.Normal()
             window.Element('_MENU_').Update(visible=False)
+            print()
         elif event == 'Popout':
             show_debugger_popout_window()
         elif event == 'Launch Debugger':