diff --git a/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp b/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp
index c5addcaa5d..9e236ccc8b 100644
--- a/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp
+++ b/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp
@@ -187,7 +187,10 @@ PluginWindow* PluginGraph::getOrCreateWindowFor (AudioProcessorGraph::Node* node
             }
 
             auto localDpiDisabler = makeDPIAwarenessDisablerForPlugin (description);
-            return activePluginWindows.add (new PluginWindow (node, type, activePluginWindows));
+            return activePluginWindows.add (new PluginWindow (node,
+                                                              type,
+                                                              activePluginWindows,
+                                                              getCommandManager().getKeyMappings()));
         }
     }
 
diff --git a/extras/AudioPluginHost/Source/UI/PluginWindow.h b/extras/AudioPluginHost/Source/UI/PluginWindow.h
index 161d81012e..a203a7b909 100644
--- a/extras/AudioPluginHost/Source/UI/PluginWindow.h
+++ b/extras/AudioPluginHost/Source/UI/PluginWindow.h
@@ -169,10 +169,13 @@ public:
         numTypes
     };
 
-    PluginWindow (AudioProcessorGraph::Node* n, Type t, OwnedArray<PluginWindow>& windowList)
+    PluginWindow (AudioProcessorGraph::Node* n,
+                  Type t,
+                  OwnedArray<PluginWindow>& windowList,
+                  KeyListener* keyListener)
         : DocumentWindow (n->getProcessor()->getName() + getFormatSuffix (n->getProcessor()),
-                          LookAndFeel::getDefaultLookAndFeel().findColour (ResizableWindow::backgroundColourId),
-                          DocumentWindow::minimiseButton | DocumentWindow::closeButton),
+                          LookAndFeel::getDefaultLookAndFeel().findColour (backgroundColourId),
+                          minimiseButton | closeButton),
           activeWindowList (windowList),
           node (n), type (t)
     {
@@ -206,6 +209,8 @@ public:
         node->properties.set (getOpenProp (type), true);
 
         setVisible (true);
+
+        addKeyListener (keyListener);
     }
 
     ~PluginWindow() override