diff --git a/src/k_menu.h b/src/k_menu.h
index baa9eb356..356a0a4ee 100644
--- a/src/k_menu.h
+++ b/src/k_menu.h
@@ -963,7 +963,7 @@ void M_ReplayHut(INT32 choice);
 // Misc menus:
 #define numaddonsshown 4
 void M_Addons(INT32 choice);
-boolean M_AddonsRefresh(void);
+void M_AddonsRefresh(void);
 void M_HandleAddons(INT32 choice);
 char *M_AddonsHeaderPath(void);
 
diff --git a/src/k_menudef.c b/src/k_menudef.c
index 0da8f04be..6d32a4646 100644
--- a/src/k_menudef.c
+++ b/src/k_menudef.c
@@ -1742,7 +1742,7 @@ menu_t MISC_AddonsDef = {
 	0, 0,
 	0, 0,
 	M_DrawAddons,
-	NULL,
+	M_AddonsRefresh,
 	NULL,
 	NULL,
 	NULL
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index db5854e31..ff7c1550f 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -4284,13 +4284,6 @@ void M_DrawAddons(void)
 		V_DrawFixedPatch(0, 0, FRACUNIT, 0, bg, NULL);
 	}
 
-	// hack - need to refresh at end of frame to handle addfile...
-	if (refreshdirmenu & M_AddonsRefresh())
-	{
-		M_DrawMessageMenu();
-		return;
-	}
-
 	if (Playing())
 		V_DrawCenteredString(BASEVIDWIDTH/2, 5, warningflags, "Adding files mid-game may cause problems.");
 	else
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index dcc4c7082..0212f6ac6 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -6321,8 +6321,8 @@ static void M_AddonsClearName(INT32 choice)
 	M_StopMessage(choice);
 }
 
-// returns whether to do message draw
-boolean M_AddonsRefresh(void)
+// Handles messages for addon errors.
+void M_AddonsRefresh(void)
 {
 	if ((refreshdirmenu & REFRESHDIR_NORMAL) && !preparefilemenu(true, false))
 	{
@@ -6331,7 +6331,7 @@ boolean M_AddonsRefresh(void)
 		{
 			CLEARNAME;
 		}
-		return true;
+		return;// true;
 	}
 
 #ifdef DEVELOP
@@ -6368,23 +6368,23 @@ boolean M_AddonsRefresh(void)
 		if (message)
 		{
 			M_StartMessage(message,FUNCPTRCAST(M_AddonsClearName),MM_YESNO);
-			return true;
+			return;// true;
 		}
 
 		S_StartSound(NULL, sfx_s221);
 		CLEARNAME;
 	}
 
-	return false;
+	return;// false;
 }
 
 static void M_AddonExec(INT32 ch)
 {
-	if (ch == MA_NO)
-		return;
-
-	S_StartSound(NULL, sfx_zoom);
-	COM_BufAddText(va("exec \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
+	if (ch == MA_YES)
+	{
+		S_StartSound(NULL, sfx_zoom);
+		COM_BufAddText(va("exec \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
+	}
 }
 
 #define len menusearch[0]