diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 6ab84840..f5d3f043 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -2131,12 +2131,18 @@ void Notepad_plus::command(int id)
 				}
 				else if (iQuote == -2)
 				{
-					showAllQuotes();
+					generic_string noEasterEggsPath((NppParameters::getInstance())->getNppPath());
+					noEasterEggsPath.append(TEXT("\\noEasterEggs.xml"));
+					if (!::PathFileExists(noEasterEggsPath.c_str()))
+						showAllQuotes();
 					return;
 				}
 				if (iQuote != -1)
 				{
-					showQuoteFromIndex(iQuote);
+					generic_string noEasterEggsPath((NppParameters::getInstance())->getNppPath());
+					noEasterEggsPath.append(TEXT("\\noEasterEggs.xml"));
+					if (!::PathFileExists(noEasterEggsPath.c_str()))
+						showQuoteFromIndex(iQuote);
 					return;
 				}	
 			}