diff --git a/Classes/MGSplitViewController.m b/Classes/MGSplitViewController.m
index 61b30a6..40d8fd4 100644
--- a/Classes/MGSplitViewController.m
+++ b/Classes/MGSplitViewController.m
@@ -704,16 +704,21 @@ - (IBAction)toggleMasterView:(id)sender
 
 - (IBAction)showMasterPopover:(id)sender
 {
-	if (_hiddenPopoverController && !(_hiddenPopoverController.popoverVisible)) {
-		// Inform delegate.
-		if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:popoverController:willPresentViewController:)]) {
-			[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self 
-																	 popoverController:_hiddenPopoverController 
-															 willPresentViewController:self.masterViewController];
-		}
-		
-		// Show popover.
-		[_hiddenPopoverController presentPopoverFromBarButtonItem:_barButtonItem permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
+	if (_hiddenPopoverController) {
+        if (_hiddenPopoverController.popoverVisible) {
+            // Hide popover.
+            [_hiddenPopoverController dismissPopoverAnimated:YES];
+        } else {
+            // Inform delegate.
+            if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:popoverController:willPresentViewController:)]) {
+                [(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
+                                                                         popoverController:_hiddenPopoverController
+                                                                 willPresentViewController:self.masterViewController];
+            }
+
+            // Show popover.
+            [_hiddenPopoverController presentPopoverFromBarButtonItem:_barButtonItem permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
+        }
 	}
 }