diff --git a/src/gui_x11.c b/src/gui_x11.c
index 03300e4..90e793c 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1834,7 +1834,16 @@
 
 #ifdef FEAT_XFONTSET
     XFontSet	fontset = NULL;
+#endif
 
+#ifdef FEAT_GUI_MOTIF
+    /* A font name equal "*" is indicating, that we should activate the font
+     * selection dialogue to get a new font name. So let us do it here. */
+    if (font_name != NULL && STRCMP(font_name, "*") == 0)
+	font_name = gui_xm_select_font(hl_get_font_name());
+#endif
+
+#ifdef FEAT_XFONTSET
     if (do_fontset)
     {
 	/* If 'guifontset' is set, VIM treats all font specifications as if
@@ -1936,6 +1945,10 @@
 	}
     }
 
+#ifdef FEAT_GUI_MOTIF
+    gui_motif_synch_fonts();
+#endif
+
     return OK;
 }
 
@@ -1988,6 +2001,7 @@
     return (GuiFont)font;
 }
 
+#if defined(FEAT_EVAL) || defined(PROTO)
 /*
  * Return the name of font "font" in allocated memory.
  * Don't know how to get the actual name, thus use the provided name.
@@ -2002,6 +2016,7 @@
 	return NULL;
     return vim_strsave(name);
 }
+#endif
 
     int
 gui_mch_adjust_charsize()
diff --git a/src/main.c b/src/main.c
index 78639a2..7ab914c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3158,7 +3158,7 @@
     }
     /* Bring the window to the foreground, goto Insert mode when 'im' set and
      * clear command line. */
-    ga_concat(&ga, (char_u *)"cal foreground()|if &im|star|en|ec<CR>");
+    ga_concat(&ga, (char_u *)"cal foreground()|if &im|star|en|redr|f<CR>");
     ga_append(&ga, NUL);
     return ga.ga_data;
 }