diff --git a/src/Menus.cpp b/src/Menus.cpp
index 0594a3498..c2f14addb 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -50,6 +50,11 @@ MenuCreator::MenuCreator()
 {
    mLastAnalyzerRegistration = repeattypenone;
    mLastToolRegistration = repeattypenone;
+   
+   mRepeatGeneratorFlags = 0;
+   mRepeatEffectFlags = 0;
+   mRepeatAnalyzerFlags = 0;
+   mRepeatToolFlags = 0;
 }
 
 MenuCreator::~MenuCreator()
diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp
index ef23429ab..b5ed43e7c 100644
--- a/src/menus/PluginMenus.cpp
+++ b/src/menus/PluginMenus.cpp
@@ -462,7 +462,7 @@ void OnRepeatLastEffect(const CommandContext &context)
    if (!lastEffect.empty())
    {
       EffectUI::DoEffect(
-         lastEffect, context, menuManager.mRepeatGeneratorFlags);
+         lastEffect, context, menuManager.mRepeatEffectFlags);
    }
 }