diff --git a/qrenderdoc/Widgets/BufferFormatSpecifier.cpp b/qrenderdoc/Widgets/BufferFormatSpecifier.cpp
index d576d5d41..2eeda8e6b 100644
--- a/qrenderdoc/Widgets/BufferFormatSpecifier.cpp
+++ b/qrenderdoc/Widgets/BufferFormatSpecifier.cpp
@@ -139,6 +139,10 @@ BufferFormatSpecifier::BufferFormatSpecifier(QWidget *parent)
 BufferFormatSpecifier::~BufferFormatSpecifier()
 {
   delete ui;
+
+  // unregister any shortcuts on this window
+  if(m_Ctx)
+    m_Ctx->GetMainWindow()->UnregisterShortcut(QString(), this);
 }
 
 void BufferFormatSpecifier::setAutoFormat(QString autoFormat)