diff --git a/collects/drracket/private/language-configuration.rkt b/collects/drracket/private/language-configuration.rkt
index 468fddb43a..d108a0a668 100644
--- a/collects/drracket/private/language-configuration.rkt
+++ b/collects/drracket/private/language-configuration.rkt
@@ -375,8 +375,9 @@
             (define/override (on-select i)
               (cond
                 [(and i (is-a? i hieritem-language<%>))
-                 (preferences:set 'drracket:language-dialog:hierlist-default (send (send i get-language) get-language-position))
-                 (set! most-recent-languages-hier-list-selection i)
+                 (define pos (send (send i get-language) get-language-position))
+                 (preferences:set 'drracket:language-dialog:hierlist-default pos)
+                 (set! most-recent-languages-hier-list-selection pos)
                  (something-selected i)]
                 [else
                  (non-language-selected)]))
@@ -430,8 +431,7 @@
                   (use-chosen-language-rb-callback))]))
         (define (use-chosen-language-rb-callback)
           (when most-recent-languages-hier-list-selection
-            (send languages-hier-list select 
-                  most-recent-languages-hier-list-selection))
+            (select-a-language-in-hierlist most-recent-languages-hier-list-selection))
           (send use-language-in-source-rb set-selection #f)
           (send languages-hier-list focus))
         (define languages-hier-list-panel (new horizontal-panel% [parent languages-choice-panel]))