diff --git a/src/dialog.c b/src/dialog.c
index 2cbf0f93..0a302d50 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1042,7 +1042,7 @@ wShowInfoPanel(WScreen *scr)
     WMSetLabelTextAlignment(panel->copyrL, WALeft);
     WMSetLabelText(panel->copyrL, COPYRIGHT_TEXT);
     /* we want the (c) character in the helvetica font */
-    font = WMCreateFontInDefaultEncoding(scr->wmscreen, HELVETICA10_FONT);
+    font = WMCreateNormalFont(scr->wmscreen, HELVETICA10_FONT);
     if (font) {
 	WMSetLabelFont(panel->copyrL, font);
     }
diff --git a/src/workspace.c b/src/workspace.c
index f61387ce..f60ddf6d 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -612,8 +612,7 @@ wWorkspaceForceChange(WScreen *scr, int workspace)
         }
     }
 
-    if (!scr->flags.startup2)
-	showWorkspaceName(scr, workspace);
+    showWorkspaceName(scr, workspace);
 
 #ifdef GNOME_STUFF
     wGNOMEUpdateCurrentWorkspaceHint(scr);