diff --git a/plugins/zynaddsubfx/ChangeLog b/plugins/zynaddsubfx/ChangeLog
index faa216df6..3cb7dff39 100644
--- a/plugins/zynaddsubfx/ChangeLog
+++ b/plugins/zynaddsubfx/ChangeLog
@@ -960,3 +960,6 @@
 
 28 Oct 2009 (Paul Nasca)
 	    - Disable "bw" control on Reverb when Bandwidth mode is not enabled
+
+18 Nov 2009 (Mark McCurry)
+	    - Fixed segfault in VirKeyBoard
diff --git a/plugins/zynaddsubfx/src/UI/VirKeyboard.cc b/plugins/zynaddsubfx/src/UI/VirKeyboard.cc
index 25df926ad..af7626428 100644
--- a/plugins/zynaddsubfx/src/UI/VirKeyboard.cc
+++ b/plugins/zynaddsubfx/src/UI/VirKeyboard.cc
@@ -103,7 +103,7 @@ if ((event==FL_PUSH)||(event==FL_DRAG)||(event==FL_RELEASE)){
        };
    };
 
-   if (((event==FL_PUSH)||(event==FL_DRAG))&&
+   if ((keypos!=-1)&&((event==FL_PUSH)||(event==FL_DRAG))&&
        (Fl::event_shift()==0)) {
         presskey(kpos,1,1);
    };
diff --git a/plugins/zynaddsubfx/src/UI/VirKeyboard.fl b/plugins/zynaddsubfx/src/UI/VirKeyboard.fl
index 37fe43e5c..2a7ab52eb 100644
--- a/plugins/zynaddsubfx/src/UI/VirKeyboard.fl
+++ b/plugins/zynaddsubfx/src/UI/VirKeyboard.fl
@@ -138,7 +138,7 @@ if ((event==FL_PUSH)||(event==FL_DRAG)||(event==FL_RELEASE)){
        };
    };
 
-   if (((event==FL_PUSH)||(event==FL_DRAG))&&
+   if ((keypos!=-1)&&((event==FL_PUSH)||(event==FL_DRAG))&&
        (Fl::event_shift()==0)) {
         presskey(kpos,1,1);
    };