diff --git a/macosx/Base.lproj/Preferences.xib b/macosx/Base.lproj/Preferences.xib
index 801a8c74b..7450f52e2 100644
--- a/macosx/Base.lproj/Preferences.xib
+++ b/macosx/Base.lproj/Preferences.xib
@@ -125,6 +125,7 @@
                                                         <menuItem title="Alert And Notification" tag="3" id="496"/>
                                                         <menuItem title="Put Computer To Sleep" tag="4" id="497"/>
                                                         <menuItem title="Shut Down Computer" tag="5" id="498"/>
+                                                        <menuItem title="Quit HandBrake" tag="6" id="500"/>
                                                     </items>
                                                 </menu>
                                             </popUpButtonCell>
diff --git a/macosx/Base.lproj/Queue.xib b/macosx/Base.lproj/Queue.xib
index c4b858ada..bc0f000a3 100644
--- a/macosx/Base.lproj/Queue.xib
+++ b/macosx/Base.lproj/Queue.xib
@@ -96,6 +96,7 @@
                                         <menuItem title="Alert and Notification" tag="3" id="aat-1N-Odn"/>
                                         <menuItem title="Put Computer to Sleep" tag="4" id="GUQ-xb-HVS"/>
                                         <menuItem title="Shut Down Computer" tag="5" id="QmP-SQ-XKK"/>
+                                        <menuItem title="Quit HandBrake" tag="6" id="tBG-Gf-ynI"/>
                                     </items>
                                 </menu>
                             </popUpButtonCell>
diff --git a/macosx/HBPreferencesKeys.h b/macosx/HBPreferencesKeys.h
index 93051ddfd..55aaa1a12 100644
--- a/macosx/HBPreferencesKeys.h
+++ b/macosx/HBPreferencesKeys.h
@@ -14,6 +14,7 @@ typedef NS_ENUM(NSUInteger, HBDoneAction) {
     HBDoneActionAlertAndNotification = 3,
     HBDoneActionSleep = 4,
     HBDoneActionShutDown = 5,
+    HBDoneActionQuit = 6,
 };
 
 extern NSString * const HBShowOpenPanelAtLaunch;
diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index c6a2b5ec5..323cc1370 100644
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -554,6 +554,12 @@ NSString * const HBQueueItemNotificationPathKey = @"HBQueueItemNotificationPathK
         NSAppleScript *scriptObject = [[NSAppleScript alloc] initWithSource:@"tell application \"System Events\" to shut down"];
         [scriptObject executeAndReturnError:NULL];
     }
+
+    // If Quit HB has been selected
+    if ([ud integerForKey:HBAlertWhenDone] == HBDoneActionQuit)
+    {
+        [NSApp terminate:self];
+    }
 }
 
 - (void)queueLowDiskSpaceAlert