diff --git a/src/ui/widgets/DisassemblerMetadataDialog.cpp b/src/ui/widgets/DisassemblerMetadataDialog.cpp
index 34004f3..8565b4b 100644
--- a/src/ui/widgets/DisassemblerMetadataDialog.cpp
+++ b/src/ui/widgets/DisassemblerMetadataDialog.cpp
@@ -53,6 +53,11 @@ void DisassemblerMetadataDialog::showEvent(QShowEvent *)
     ui->symbolTable->resizeRowsToContents();
 }
 
+void DisassemblerMetadataDialog::closeEvent(QCloseEvent *)
+{
+    handleExitButton();
+}
+
 void DisassemblerMetadataDialog::handleExitButton()
 {
     m_bfm->requestDisassembly();
diff --git a/src/ui/widgets/DisassemblerMetadataDialog.h b/src/ui/widgets/DisassemblerMetadataDialog.h
index 5fbf3a1..97f14d3 100644
--- a/src/ui/widgets/DisassemblerMetadataDialog.h
+++ b/src/ui/widgets/DisassemblerMetadataDialog.h
@@ -26,6 +26,7 @@ public:
 protected:
     void showEvent(QShowEvent *);
 
+    void closeEvent(QCloseEvent *);
 protected slots:
     void handleExitButton();
     void handleProcessButton();
diff --git a/src/ui/widgets/DisassemblerMetadataDialog.ui b/src/ui/widgets/DisassemblerMetadataDialog.ui
index 03f63be..db0257b 100644
--- a/src/ui/widgets/DisassemblerMetadataDialog.ui
+++ b/src/ui/widgets/DisassemblerMetadataDialog.ui
@@ -34,6 +34,12 @@
        <property name="text">
         <string>Apply</string>
        </property>
+       <property name="autoDefault">
+        <bool>true</bool>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
@@ -41,8 +47,11 @@
        <property name="text">
         <string>&amp;Exit</string>
        </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
        <property name="default">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>