@@ -185,12 +185,14 @@ def show_window(self, comp_lists, index, complete, mode, userWantsWin):
         self.autocompletewindow = acw = Toplevel(self.widget)
         acw.withdraw()
         acw.wm_overrideredirect(1)
-        try:
+        if acw._windowingsystem == 'aqua':
             # Prevent grabbing focus on macOS.
-            acw.tk.call("::tk::unsupported::MacWindowStyle", "style", acw._w,
-                        "help", "noActivates")
-        except TclError:
-            pass
+            if acw.info_patchlevel() >= (9, 1):
+                acw.update_idletasks()
+                acw.wm_attributes(stylemask='docmodal')
+            else:
+                acw.tk.call('::tk::unsupported::MacWindowStyle', 'style',
+                            acw._w, 'help', 'noActivates')
         self.scrollbar = scrollbar = Scrollbar(acw, orient=VERTICAL)
         self.listbox = listbox = Listbox(acw, yscrollcommand=scrollbar.set,
                                          exportselection=False)
 
@@ -30,14 +30,15 @@ def showtip(self):
         self.tipwindow = tw = Toplevel(self.anchor_widget)
         # show no border on the top level window
         tw.wm_overrideredirect(1)
-        try:
-            # This command is only needed and available on Tk >= 8.4.0 for OSX.
-            # Without it, call tips intrude on the typing process by grabbing
-            # the focus.
-            tw.tk.call("::tk::unsupported::MacWindowStyle", "style", tw._w,
-                       "help", "noActivates")
-        except TclError:
-            pass
+        if tw._windowingsystem == 'aqua':
+            # Without this, call tips intrude on the typing process by
+            # grabbing the focus.
+            if tw.info_patchlevel() >= (9, 1):
+                tw.update_idletasks()
+                tw.wm_attributes(stylemask='docmodal')
+            else:
+                tw.tk.call('::tk::unsupported::MacWindowStyle', 'style',
+                           tw._w, 'help', 'noActivates')
 
         self.position_window()
         self.showcontents()
 
@@ -0,0 +1,2 @@
+Fix the completion list and the call tip grabbing the focus on macOS with
+Tcl/Tk 9.1.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix the completion list and the call tip grabbing the focus on macOS with`
	`2`	`+Tcl/Tk 9.1.`