3 files changed, 26 insertions, 2 deletions
diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h
index 820f2a1a..28a625d5 100644
--- a/Source/SPQueryFavoriteManager.h
+++ b/Source/SPQueryFavoriteManager.h
@@ -59,6 +59,7 @@ enum sp_favorite_types
 	NSMutableString *pendingQueryString;
 	
 	NSUInteger selectedRowBeforeChangingSelection;
+	BOOL isTableCellEditing;
 }
 
 - (id)initWithDelegate:(id)managerDelegate;
diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m
index e49dbb13..5ad6644d 100644
--- a/Source/SPQueryFavoriteManager.m
+++ b/Source/SPQueryFavoriteManager.m
@@ -303,6 +303,13 @@
 - (IBAction)closeQueryManagerSheet:(id)sender
 {
 
+	// First check for ESC if pressed while inline editing
+	if(![sender tag] && isTableCellEditing) {
+		[favoritesTableView abortEditing];
+		isTableCellEditing = NO;
+		return;
+	}
+
 	[NSApp endSheet:[self window] returnCode:0];
 	[[self window] orderOut:self];
 
@@ -485,7 +492,12 @@
  */
 - (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
 {
-	return ([[favoriteProperties objectAtIndex:rowIndex] intValue] == SP_FAVORITETYPE_HEADER) ? NO : YES;
+	if([[favoriteProperties objectAtIndex:rowIndex] intValue] == SP_FAVORITETYPE_HEADER) {
+		return NO;
+	} else {
+		isTableCellEditing = YES;
+		return YES;
+	}
 }
 
 /*
@@ -495,7 +507,13 @@
 {
 	return ([[favoriteProperties objectAtIndex:rowIndex] intValue] == SP_FAVORITETYPE_HEADER) ? YES : NO;
 }
-
+/*
+ * Detect if inline editing was done - then ESC to close the sheet will be activate
+ */ 
+- (void)controlTextDidEndEditing:(NSNotification *)aNotification
+{
+	isTableCellEditing = NO;
+}
 /*
  * Changes in the name text field will be saved in data source directly
  * to update the table view accordingly
diff --git a/Source/SPTableView.m b/Source/SPTableView.m
index 38cd949e..801a528b 100644
--- a/Source/SPTableView.m
+++ b/Source/SPTableView.m
@@ -23,6 +23,7 @@
 //  More info at <http://code.google.com/p/sequel-pro/>
 
 #import "SPTableView.h"
+#import "SPQueryFavoriteManager.h"
 #import "SPArrayAdditions.h"
 
 @implementation SPTableView
@@ -46,6 +47,10 @@
 			if([NSArrayObjectAtIndex([[self delegate] valueForKeyPath:@"tableTypes"], row) intValue] == -1)
 				return nil;
 		}
+		if([[[[self delegate] class] description] isEqualToString:@"SPQueryFavoriteManager"]) {
+			if([NSArrayObjectAtIndex([[self delegate] valueForKeyPath:@"favoriteProperties"], row) intValue] == SP_FAVORITETYPE_HEADER)
+				return nil;
+		}
 		
 		[self selectRow:row byExtendingSelection:NO];
 		[[self window] makeFirstResponder:self];