diff --git a/NEWS b/NEWS
index 7ff4dd6..5b68fea 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-1.5.11: 
+1.5.11: December 27, 2008
  * Added a font selection button to the toolbar.
  * Decreased the default note text font size, so now you can see more of your
    note text at once.
diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index 286e377..4baa02c 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -4258,8 +4258,8 @@ function Font_pulldown( wiki, notebook_id, invoker, anchor, editor ) {
   var current_font_family = editor.query_command_value( "fontname" );
   if ( current_font_family ) {
     current_font_family = current_font_family.toLowerCase();
-    if ( WEBKIT )
-      current_font_family = current_font_family.replace( /'/g, "" ).replace( /-webkit-/, "" );
+    current_font_family = current_font_family.replace( /'/g, "" ).replace( /-webkit-/, "" );
+    current_font_family = current_font_family.split( ',' )[ 0 ];
   }
 
   for ( var i in fonts ) {