diff --git a/plugins/zynaddsubfx/ChangeLog b/plugins/zynaddsubfx/ChangeLog
index fc73cf1c4..faa216df6 100644
--- a/plugins/zynaddsubfx/ChangeLog
+++ b/plugins/zynaddsubfx/ChangeLog
@@ -957,3 +957,6 @@
 
 09 Oct 2009 (Mark McCurry)
 	    - Restylized codebase with uncrustify
+
+28 Oct 2009 (Paul Nasca)
+	    - Disable "bw" control on Reverb when Bandwidth mode is not enabled
diff --git a/plugins/zynaddsubfx/src/UI/EffUI.cc b/plugins/zynaddsubfx/src/UI/EffUI.cc
index 9c1b141c7..7c21f0000 100644
--- a/plugins/zynaddsubfx/src/UI/EffUI.cc
+++ b/plugins/zynaddsubfx/src/UI/EffUI.cc
@@ -146,6 +146,8 @@ Fl_Menu_Item EffUI::menu_revp[] = {
 
 void EffUI::cb_revp10_i(Fl_Choice* o, void*) {
   eff->seteffectpar(10,(int) o->value());
+if (eff->geteffectpar(10)==2) revp12->activate();
+	else revp12->deactivate();
 }
 void EffUI::cb_revp10(Fl_Choice* o, void* v) {
   ((EffUI*)(o->parent()->user_data()))->cb_revp10_i(o,v);
@@ -1104,7 +1106,7 @@ Fl_Group* EffUI::make_reverb_window() {
       revp4->align(Fl_Align(FL_ALIGN_BOTTOM));
       revp4->when(FL_WHEN_CHANGED);
     } // WidgetPDial* revp4
-    { revp12 = new WidgetPDial(200, 40, 30, 30, "bw");
+    { WidgetPDial* o = revp12 = new WidgetPDial(200, 40, 30, 30, "bw");
       revp12->box(FL_ROUND_UP_BOX);
       revp12->color(FL_BACKGROUND_COLOR);
       revp12->selection_color(FL_INACTIVE_COLOR);
@@ -1116,6 +1118,8 @@ Fl_Group* EffUI::make_reverb_window() {
       revp12->callback((Fl_Callback*)cb_revp12);
       revp12->align(Fl_Align(FL_ALIGN_BOTTOM));
       revp12->when(FL_WHEN_RELEASE);
+      revp12->deactivate();
+      if (eff->geteffectpar(10)==2) o->activate();
     } // WidgetPDial* revp12
     { revp6 = new WidgetPDial(235, 40, 30, 30, "E/R");
       revp6->box(FL_ROUND_UP_BOX);
diff --git a/plugins/zynaddsubfx/src/UI/EffUI.fl b/plugins/zynaddsubfx/src/UI/EffUI.fl
index 178f3ad04..a5830506f 100644
--- a/plugins/zynaddsubfx/src/UI/EffUI.fl
+++ b/plugins/zynaddsubfx/src/UI/EffUI.fl
@@ -260,7 +260,9 @@ refresh(eff);}
       }
       Fl_Choice revp10 {
         label Type
-        callback {eff->seteffectpar(10,(int) o->value());} open
+        callback {eff->seteffectpar(10,(int) o->value());
+if (eff->geteffectpar(10)==2) revp12->activate();
+	else revp12->deactivate();}
         xywh {110 15 85 15} down_box BORDER_BOX color 14 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
       } {
         MenuItem {} {
@@ -309,7 +311,8 @@ refresh(eff);}
       Fl_Dial revp12 {
         label bw
         callback {eff->seteffectpar(12,(int) o->value());}
-        xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
+        xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127 deactivate
+        code0 {if (eff->geteffectpar(10)==2) o->activate();}
         class WidgetPDial
       }
       Fl_Dial revp6 {
@@ -341,7 +344,7 @@ refresh(eff);}
         callback {int x=64;
 if (Fl::event_button1()) x=(int)o->value();
    else o->value(x);
-eff->seteffectpar(11,x);}
+eff->seteffectpar(11,x);} selected
         tooltip RoomSize xywh {200 10 25 25} box ROUND_UP_BOX labelfont 1 labelsize 8 align 8 minimum 1 maximum 127 step 1
         class WidgetPDial
       }
@@ -1417,8 +1420,7 @@ switch(eff->geteffect()){
             break; 
 };
 
-this->show();} {selected
-    }
+this->show();} {}
   }
   Function {refresh()} {} {
     code {refresh(eff);} {}