diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp
index 4d4b37f6d..2a0f47920 100644
--- a/src/effects/VST/VSTEffect.cpp
+++ b/src/effects/VST/VSTEffect.cpp
@@ -2448,7 +2448,8 @@ void VSTEffect::ShowOptions()
    if (dlg.ShowModal())
    {
       // Reinitialize configuration settings
-      SetHost(mHost);
+      mHost->GetSharedConfig(wxT("Options"), wxT("BufferSize"), mUserBlockSize, 8192);
+      mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
    }
 }
 
diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp
index 95026fe51..306e6d21e 100644
--- a/src/effects/audiounits/AudioUnitEffect.cpp
+++ b/src/effects/audiounits/AudioUnitEffect.cpp
@@ -2112,10 +2112,12 @@ bool AudioUnitEffect::HasOptions()
 void AudioUnitEffect::ShowOptions()
 {
    AudioUnitEffectOptionsDialog dlg(mParent, mHost);
-   dlg.ShowModal();
-
-   mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
-   mHost->GetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI, true);
+   if (dlg.ShowModal())
+   {
+      // Reinitialize configuration settings
+      mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
+      mHost->GetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI, true);
+   }
 }
 
 // ============================================================================