diff --git a/src/edit.c b/src/edit.c
index e04c720..714d320 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3608,8 +3608,6 @@
 		    inc_cursor();
 	    }
 
-	    auto_format(FALSE, TRUE);
-
 	    /* If the popup menu is displayed pressing CTRL-Y means accepting
 	     * the selection without inserting anything.  When
 	     * compl_enter_selects is set the Enter key does the same. */
@@ -3630,6 +3628,8 @@
 		retval = TRUE;
 	    }
 
+	    auto_format(FALSE, TRUE);
+
 	    ins_compl_free();
 	    compl_started = FALSE;
 	    compl_matches = 0;