--- a/FontPanel.st	Sun Apr 27 22:45:00 2014 +0200
+++ b/FontPanel.st	Sun Apr 27 23:57:23 2014 +0200
@@ -484,6 +484,12 @@
     |encoding|
 
     selectedFont := aFont.
+    currentFamily := aFont family.
+    currentFace := aFont face.
+    currentStyle := aFont style.
+    currentSize := aFont size.
+    currentFaceAndStyle := currentFace,'-',currentStyle.
+
     self xftFontsOnlyHolder value:(aFont isXftFont).
     encoding := aFont encoding.    
     sizeUnit := aFont sizeUnit.
@@ -1205,6 +1211,20 @@
 
     faceList list:list.
     currentFaceAndStyle notNil ifTrue:[
+        (list includes:currentFaceAndStyle) ifFalse:[
+            currentFaceAndStyle = 'normal-roman' ifTrue:[
+                (list includes:'regular-roman') ifTrue:[
+                    currentFaceAndStyle := 'regular-roman'.
+                    currentFace := 'regular'.
+                    currentStyle := 'roman'.
+                ].
+                (list includes:'medium-roman') ifTrue:[
+                    currentFaceAndStyle := 'medium-roman'.
+                    currentFace := 'medium'.
+                    currentStyle := 'roman'.
+                ].
+            ].
+        ].
         (list includes:currentFaceAndStyle) ifTrue:[
             faceList setSelectElement:currentFaceAndStyle.
             self faceSelected:currentFaceAndStyle showPreview:showPreview.
@@ -1215,6 +1235,7 @@
         "/ faceList setSelectElement:(list first).
         faceList selectElement:(list first).
         self faceSelected:(list first) showPreview:showPreview.
+        self updateSizeList.
         ^ self
     ].
 
@@ -1297,10 +1318,10 @@
 !FontPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.125 2014-04-27 20:45:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.126 2014-04-27 21:57:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.125 2014-04-27 20:45:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.126 2014-04-27 21:57:23 cg Exp $'
 ! !