diff --git a/macosx/AddMagnetWindowController.h b/macosx/AddMagnetWindowController.h
index 6c17aa51e..5ae8ca244 100644
--- a/macosx/AddMagnetWindowController.h
+++ b/macosx/AddMagnetWindowController.h
@@ -29,7 +29,7 @@
@interface AddMagnetWindowController : NSWindowController
{
- IBOutlet NSImageView * fIconView, * fLocationImageView;
+ IBOutlet NSImageView * fLocationImageView;
IBOutlet NSTextField * fNameField, * fLocationField;
IBOutlet NSButton * fStartCheck;
IBOutlet NSPopUpButton * fGroupPopUp, * fPriorityPopUp;
diff --git a/macosx/AddMagnetWindowController.m b/macosx/AddMagnetWindowController.m
index 30076058e..5602d21b9 100644
--- a/macosx/AddMagnetWindowController.m
+++ b/macosx/AddMagnetWindowController.m
@@ -72,8 +72,7 @@
NSString * name = [fTorrent name];
[[self window] setTitle: name];
[fNameField setStringValue: name];
-
- [fIconView setImage: [fTorrent icon]];
+ [fNameField setToolTip: name];
[self setGroupsMenu];
[fGroupPopUp selectItemWithTag: fGroupValue];
diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m
index bdacac889..24e56ec91 100644
--- a/macosx/AddWindowController.m
+++ b/macosx/AddWindowController.m
@@ -92,6 +92,7 @@
NSString * name = [fTorrent name];
[[self window] setTitle: name];
[fNameField setStringValue: name];
+ [fNameField setToolTip: name];
[fIconView setImage: [fTorrent icon]];
diff --git a/macosx/en.lproj/AddMagnetWindow.xib b/macosx/en.lproj/AddMagnetWindow.xib
index e25865538..2c1e96a35 100644
--- a/macosx/en.lproj/AddMagnetWindow.xib
+++ b/macosx/en.lproj/AddMagnetWindow.xib
@@ -12,7 +12,7 @@