diff --git a/collects/handin-client/client-gui.ss b/collects/handin-client/client-gui.ss
index 6264afff83..f078600e6d 100644
--- a/collects/handin-client/client-gui.ss
+++ b/collects/handin-client/client-gui.ss
@@ -181,17 +181,12 @@
 						     (set! continue-abort? #t)
 						     (send d show #f))))))
 
+      (define interface-widgets
+        (list ok username passwd assignment retrieve?))
       (define (disable-interface)
-	(send ok enable #f)
-	(send username enable #f)
-	(send passwd enable #f)
-	(send assignment enable #f))
+        (for-each (lambda (x) (send x enable #f)) interface-widgets))
       (define (enable-interface)
-	(send ok enable #t)
-	(send username enable #t)
-	(send passwd enable #t)
-	(send assignment enable #t)
-        (send passwd focus))
+        (for-each (lambda (x) (send x enable #t)) interface-widgets))
       (define (done-interface)
         (send cancel set-label "Close")
         (send cancel focus))