diff --git a/src/editor/edit-impl.h b/src/editor/edit-impl.h
index 98cef9493..c94a63939 100644
--- a/src/editor/edit-impl.h
+++ b/src/editor/edit-impl.h
@@ -250,7 +250,7 @@ long edit_insert_file (WEdit * edit, const vfs_path_t * filename_vpath);
 gboolean edit_load_back_cmd (WEdit * edit);
 gboolean edit_load_forward_cmd (WEdit * edit);
 void edit_block_process_cmd (WEdit * edit, int macro_number);
-void edit_refresh_cmd (WEdit * edit);
+void edit_refresh_cmd (void);
 void edit_date_cmd (WEdit * edit);
 void edit_goto_cmd (WEdit * edit);
 int eval_marks (WEdit * edit, long *start_mark, long *end_mark);
diff --git a/src/editor/edit.c b/src/editor/edit.c
index 16e6538c5..13a5f4880 100644
--- a/src/editor/edit.c
+++ b/src/editor/edit.c
@@ -1846,12 +1846,12 @@ user_menu (WEdit * edit, const char *menu_file, int selected_entry)
         if (fd != NULL)
             fclose (fd);
     }
-    edit_cursor_move (edit, curs - edit->curs1);
-    edit_refresh_cmd (edit);
-    edit->force |= REDRAW_COMPLETELY;
-
     g_free (block_file);
     vfs_path_free (block_file_vpath);
+
+    edit_cursor_move (edit, curs - edit->curs1);
+    edit->force |= REDRAW_PAGE;
+    send_message ((Widget *) edit, WIDGET_DRAW, 0);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -4094,9 +4094,6 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
     case CK_Find:
         edit_get_match_keyword_cmd (edit);
         break;
-    case CK_Refresh:
-        edit_refresh_cmd (edit);
-        break;
     case CK_Date:
         {
             char s[BUF_MEDIUM];
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 2a8b8c162..a0d9e5c2a 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -1437,20 +1437,10 @@ edit_delete_macro (WEdit * edit, int hotkey)
 /* --------------------------------------------------------------------------------------------- */
 
 void
-edit_refresh_cmd (WEdit * edit)
+edit_refresh_cmd (void)
 {
-#ifdef HAVE_SLANG
-    int color;
-
-    edit_get_syntax_color (edit, -1, &color);
-    tty_touch_screen ();
-    mc_refresh ();
-#else
-    (void) edit;
-
     clr_scr ();
     repaint_screen ();
-#endif /* !HAVE_SLANG */
     tty_keypad (TRUE);
 }
 
@@ -3315,8 +3305,8 @@ edit_select_codepage_cmd (WEdit * edit)
     if (do_select_codepage ())
         edit_set_codeset (edit);
 
-    edit->force = REDRAW_COMPLETELY;
-    edit_refresh_cmd (edit);
+    edit->force = REDRAW_PAGE;
+    send_message ((Widget *) edit, WIDGET_DRAW, 0);
 #else
     (void) edit;
 #endif
diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c
index b55021cdc..50c5db289 100644
--- a/src/editor/editwidget.c
+++ b/src/editor/editwidget.c
@@ -581,6 +581,9 @@ edit_dialog_command_execute (Dlg_head * h, unsigned long command)
     case CK_About:
         edit_about ();
         break;
+    case CK_Refresh:
+        edit_refresh_cmd ();
+        break;
     case CK_Shell:
         view_other_cmd ();
         break;