diff --git a/src/apps/icon-o-matic/MainWindow.cpp b/src/apps/icon-o-matic/MainWindow.cpp
index ee5a4ce07d..244dc0c12c 100644
--- a/src/apps/icon-o-matic/MainWindow.cpp
+++ b/src/apps/icon-o-matic/MainWindow.cpp
@@ -344,6 +344,12 @@ MainWindow::MessageReceived(BMessage* message)
 			}
 			break;
 		}
+		case B_CANCEL:
+			// FilePanel was canceled, do not execute the fMessageAfterSave
+			// next time a file panel is used, in case it was set!
+			delete fMessageAfterSave;
+			fMessageAfterSave = NULL;
+			break;
 
 		case MSG_UNDO:
 			fDocument->CommandStack()->Undo();