diff --git a/PopoverView/Classes/MainViewController.m b/PopoverView/Classes/MainViewController.m
index 9b5ec01..4ad0914 100644
--- a/PopoverView/Classes/MainViewController.m
+++ b/PopoverView/Classes/MainViewController.m
@@ -14,6 +14,17 @@ @implementation MainViewController
 
 //method which gets called when button at toolbar was activated
 - (void) toolbarAction:(id) sender {
+	
+	if([self.popoverController isPopoverVisible])
+	{
+		//close the popover view if toolbar button was touched
+		//again and popover is already visible
+		//Thanks to @chrisonhismac
+		
+		[self.popoverController dismissPopoverAnimated:YES];
+		return;
+	}
+	
 	//build our custom popover view
 	UIViewController* popoverContent = [[UIViewController alloc]
 										init];