diff --git a/gtk2_ardour/waves_dialog.cc b/gtk2_ardour/waves_dialog.cc
index b7d8e04ac0..a12070967a 100644
--- a/gtk2_ardour/waves_dialog.cc
+++ b/gtk2_ardour/waves_dialog.cc
@@ -107,9 +107,31 @@ WavesDialog::~WavesDialog ()
 	WM::Manager::instance().remove (_proxy);
 }
 
+void
+WavesDialog::on_esc_pressed ()
+{
+    
+}
+
+void
+WavesDialog::on_enter_pressed ()
+{
+    
+}
+
 bool
 WavesDialog::on_key_press_event (GdkEventKey* ev)
 {
+    switch (ev->keyval)
+    {
+        case GDK_Return:
+            on_enter_pressed ();
+            break;
+        case GDK_Escape:
+            on_esc_pressed ();
+            break;
+    }
+    
 	return relay_key_press (ev, this);
 }
 
diff --git a/gtk2_ardour/waves_dialog.h b/gtk2_ardour/waves_dialog.h
index 9071a578da..5e00905342 100644
--- a/gtk2_ardour/waves_dialog.h
+++ b/gtk2_ardour/waves_dialog.h
@@ -55,6 +55,10 @@ class WavesDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr, public
 	void on_unmap ();
 	void on_show ();
 
+  protected:
+    virtual void on_esc_pressed ();
+    virtual void on_enter_pressed ();
+
   private:
 
 	WM::ProxyTemporary* _proxy;