diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m
index 98de77b..e3467c0 100644
--- a/PBWebHistoryController.m
+++ b/PBWebHistoryController.m
@@ -127,6 +127,15 @@ contextMenuItemsForElement:(NSDictionary *)element
 		}
 		if ([node hasAttributes] && [[node attributes] getNamedItem:@"representedFile"])
 			return [historyController menuItemsForPaths:[NSArray arrayWithObject:[[[node attributes] getNamedItem:@"representedFile"] value]]];
+        else if ([[node class] isEqual:[DOMHTMLImageElement class]]) {
+            // Copy Image is the only menu item that makes sense here since we don't need
+			// to download the image or open it in a new window (besides with the
+			// current implementation these two entries can crash GitX anyway)
+			for (NSMenuItem *item in defaultMenuItems)
+				if ([item tag] == WebMenuItemTagCopyImageToClipboard)
+					return [NSArray arrayWithObject:item];
+			return nil;
+        }
 
 		node = [node parentNode];
 	}