diff --git a/fsl/utils/dialog.py b/fsl/utils/dialog.py
index 81d95e9cf89a72fa468d73aad8918ff3fd2349c9..83dd52a7e0aa9aa9374c5d26d528ef6e8887a7aa 100644
--- a/fsl/utils/dialog.py
+++ b/fsl/utils/dialog.py
@@ -852,14 +852,13 @@ class CheckBoxMessageDialog(wx.Dialog):
 
         self.__message.Wrap(self.GetSize().GetWidth())
 
-        yes    = self.__yesButton
-        no     = self.__noButton
-        cancel = self.__cancelButton
-
-        # TODO This does not work.
-        if   focus == 'yes':                           yes   .SetFocus()
-        elif focus == 'no'     and no     is not None: no    .SetFocus()
-        elif focus == 'cancel' and cancel is not None: cancel.SetFocus()
+        yes  = self.__yesButton
+        no   = self.__noButton
+        cncl = self.__cancelButton
+
+        if   focus == 'yes':                         yes .SetDefault()
+        elif focus == 'no'     and no   is not None: no  .SetDefault()
+        elif focus == 'cancel' and cncl is not None: cncl.SetDefault()
 
         self.SetSizer(self.__mainSizer)
         self.Layout()