diff --git a/po/de.po b/po/de.po
index a3eaa16..cc82570 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Browser 0.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-31 02:20+0100\n"
+"POT-Creation-Date: 2011-01-31 04:37+0100\n"
 "PO-Revision-Date: 2010-03-29 23:28+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: English\n"
@@ -267,8 +267,8 @@ msgstr "Aktualisierung..."
 msgid "New folder"
 msgstr "Neu Ordner"
 
-#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1049
-#: ../src/callbacks.c:1054 ../src/desktopicon.c:796 ../src/desktopicon.c:801
+#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1051
+#: ../src/callbacks.c:1056 ../src/desktopicon.c:796 ../src/desktopicon.c:801
 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
 msgid "Warning"
 msgstr "Achtung"
@@ -278,40 +278,40 @@ msgstr "Achtung"
 msgid "Are you sure you want to delete %lu file(s)?"
 msgstr ""
 
-#: ../src/callbacks.c:780
+#: ../src/callbacks.c:782
 msgid "New"
 msgstr "Neu"
 
-#: ../src/callbacks.c:785 ../src/callbacks.c:789 ../src/desktop.c:334
+#: ../src/callbacks.c:787 ../src/callbacks.c:791 ../src/desktop.c:334
 msgid "Folder"
 msgstr "Ordner"
 
-#: ../src/callbacks.c:796 ../src/desktop.c:342
+#: ../src/callbacks.c:798 ../src/desktop.c:342
 msgid "Symbolic link..."
 msgstr ""
 
-#: ../src/callbacks.c:800 ../src/desktop.c:346
+#: ../src/callbacks.c:802 ../src/desktop.c:346
 msgid "Text file"
 msgstr ""
 
-#: ../src/callbacks.c:835 ../src/desktop.c:445
+#: ../src/callbacks.c:837 ../src/desktop.c:445
 msgid "New text file.txt"
 msgstr ""
 
-#: ../src/callbacks.c:882
+#: ../src/callbacks.c:884
 msgid "Open in new _window"
 msgstr "Offnen in neue Fenster"
 
-#: ../src/callbacks.c:910
+#: ../src/callbacks.c:912
 msgid "_Unmount"
 msgstr ""
 
-#: ../src/callbacks.c:945 ../src/desktopicon.c:693 ../src/view.c:100
+#: ../src/callbacks.c:947 ../src/desktopicon.c:693 ../src/view.c:100
 #: ../src/view.c:111
 msgid "Open _with..."
 msgstr "Offnen _mit..."
 
-#: ../src/callbacks.c:1053 ../src/desktopicon.c:800
+#: ../src/callbacks.c:1055 ../src/desktopicon.c:800
 msgid "Are you sure you want to execute this file?"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 363857e..816729b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Browser 0.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-31 02:20+0100\n"
+"POT-Creation-Date: 2011-01-31 04:37+0100\n"
 "PO-Revision-Date: 2010-03-30 01:04+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
@@ -267,8 +267,8 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1049
-#: ../src/callbacks.c:1054 ../src/desktopicon.c:796 ../src/desktopicon.c:801
+#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1051
+#: ../src/callbacks.c:1056 ../src/desktopicon.c:796 ../src/desktopicon.c:801
 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
 msgid "Warning"
 msgstr ""
@@ -278,40 +278,40 @@ msgstr ""
 msgid "Are you sure you want to delete %lu file(s)?"
 msgstr ""
 
-#: ../src/callbacks.c:780
+#: ../src/callbacks.c:782
 msgid "New"
 msgstr ""
 
-#: ../src/callbacks.c:785 ../src/callbacks.c:789 ../src/desktop.c:334
+#: ../src/callbacks.c:787 ../src/callbacks.c:791 ../src/desktop.c:334
 msgid "Folder"
 msgstr ""
 
-#: ../src/callbacks.c:796 ../src/desktop.c:342
+#: ../src/callbacks.c:798 ../src/desktop.c:342
 msgid "Symbolic link..."
 msgstr ""
 
-#: ../src/callbacks.c:800 ../src/desktop.c:346
+#: ../src/callbacks.c:802 ../src/desktop.c:346
 msgid "Text file"
 msgstr ""
 
-#: ../src/callbacks.c:835 ../src/desktop.c:445
+#: ../src/callbacks.c:837 ../src/desktop.c:445
 msgid "New text file.txt"
 msgstr ""
 
-#: ../src/callbacks.c:882
+#: ../src/callbacks.c:884
 msgid "Open in new _window"
 msgstr ""
 
-#: ../src/callbacks.c:910
+#: ../src/callbacks.c:912
 msgid "_Unmount"
 msgstr ""
 
-#: ../src/callbacks.c:945 ../src/desktopicon.c:693 ../src/view.c:100
+#: ../src/callbacks.c:947 ../src/desktopicon.c:693 ../src/view.c:100
 #: ../src/view.c:111
 msgid "Open _with..."
 msgstr ""
 
-#: ../src/callbacks.c:1053 ../src/desktopicon.c:800
+#: ../src/callbacks.c:1055 ../src/desktopicon.c:800
 msgid "Are you sure you want to execute this file?"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 6a04caa..36a9bec 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Browser 0.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-31 02:20+0100\n"
+"POT-Creation-Date: 2011-01-31 04:37+0100\n"
 "PO-Revision-Date: 2010-03-29 23:28+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -267,8 +267,8 @@ msgstr "Actualisation du dossier..."
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1049
-#: ../src/callbacks.c:1054 ../src/desktopicon.c:796 ../src/desktopicon.c:801
+#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1051
+#: ../src/callbacks.c:1056 ../src/desktopicon.c:796 ../src/desktopicon.c:801
 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
 msgid "Warning"
 msgstr "Avertissement"
@@ -278,40 +278,40 @@ msgstr "Avertissement"
 msgid "Are you sure you want to delete %lu file(s)?"
 msgstr "Voulez-vous vraiment effacer %lu fichier(s)?"
 
-#: ../src/callbacks.c:780
+#: ../src/callbacks.c:782
 msgid "New"
 msgstr "Nouveau"
 
-#: ../src/callbacks.c:785 ../src/callbacks.c:789 ../src/desktop.c:334
+#: ../src/callbacks.c:787 ../src/callbacks.c:791 ../src/desktop.c:334
 msgid "Folder"
 msgstr "Dossier"
 
-#: ../src/callbacks.c:796 ../src/desktop.c:342
+#: ../src/callbacks.c:798 ../src/desktop.c:342
 msgid "Symbolic link..."
 msgstr "Lien symbolique..."
 
-#: ../src/callbacks.c:800 ../src/desktop.c:346
+#: ../src/callbacks.c:802 ../src/desktop.c:346
 msgid "Text file"
 msgstr "Fichier texte"
 
-#: ../src/callbacks.c:835 ../src/desktop.c:445
+#: ../src/callbacks.c:837 ../src/desktop.c:445
 msgid "New text file.txt"
 msgstr "Nouveau fichier texte.txt"
 
-#: ../src/callbacks.c:882
+#: ../src/callbacks.c:884
 msgid "Open in new _window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: ../src/callbacks.c:910
+#: ../src/callbacks.c:912
 msgid "_Unmount"
 msgstr "Démonter"
 
-#: ../src/callbacks.c:945 ../src/desktopicon.c:693 ../src/view.c:100
+#: ../src/callbacks.c:947 ../src/desktopicon.c:693 ../src/view.c:100
 #: ../src/view.c:111
 msgid "Open _with..."
 msgstr "Ouvrir _avec..."
 
-#: ../src/callbacks.c:1053 ../src/desktopicon.c:800
+#: ../src/callbacks.c:1055 ../src/desktopicon.c:800
 msgid "Are you sure you want to execute this file?"
 msgstr "Voulez-vous vraiment exécuter ce fichier ?"
 
diff --git a/po/it.po b/po/it.po
index bf40fd5..79b5798 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Browser 0.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-31 02:20+0100\n"
+"POT-Creation-Date: 2011-01-31 04:37+0100\n"
 "PO-Revision-Date: 2010-04-07 23:18+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Italian\n"
@@ -267,8 +267,8 @@ msgstr ""
 msgid "New folder"
 msgstr ""
 
-#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1049
-#: ../src/callbacks.c:1054 ../src/desktopicon.c:796 ../src/desktopicon.c:801
+#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1051
+#: ../src/callbacks.c:1056 ../src/desktopicon.c:796 ../src/desktopicon.c:801
 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
 msgid "Warning"
 msgstr ""
@@ -278,40 +278,40 @@ msgstr ""
 msgid "Are you sure you want to delete %lu file(s)?"
 msgstr ""
 
-#: ../src/callbacks.c:780
+#: ../src/callbacks.c:782
 msgid "New"
 msgstr ""
 
-#: ../src/callbacks.c:785 ../src/callbacks.c:789 ../src/desktop.c:334
+#: ../src/callbacks.c:787 ../src/callbacks.c:791 ../src/desktop.c:334
 msgid "Folder"
 msgstr ""
 
-#: ../src/callbacks.c:796 ../src/desktop.c:342
+#: ../src/callbacks.c:798 ../src/desktop.c:342
 msgid "Symbolic link..."
 msgstr ""
 
-#: ../src/callbacks.c:800 ../src/desktop.c:346
+#: ../src/callbacks.c:802 ../src/desktop.c:346
 msgid "Text file"
 msgstr ""
 
-#: ../src/callbacks.c:835 ../src/desktop.c:445
+#: ../src/callbacks.c:837 ../src/desktop.c:445
 msgid "New text file.txt"
 msgstr ""
 
-#: ../src/callbacks.c:882
+#: ../src/callbacks.c:884
 msgid "Open in new _window"
 msgstr ""
 
-#: ../src/callbacks.c:910
+#: ../src/callbacks.c:912
 msgid "_Unmount"
 msgstr ""
 
-#: ../src/callbacks.c:945 ../src/desktopicon.c:693 ../src/view.c:100
+#: ../src/callbacks.c:947 ../src/desktopicon.c:693 ../src/view.c:100
 #: ../src/view.c:111
 msgid "Open _with..."
 msgstr ""
 
-#: ../src/callbacks.c:1053 ../src/desktopicon.c:800
+#: ../src/callbacks.c:1055 ../src/desktopicon.c:800
 msgid "Are you sure you want to execute this file?"
 msgstr ""
 
diff --git a/src/callbacks.c b/src/callbacks.c
index 7784677..45ad704 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -492,6 +492,8 @@ void on_detail_default(GtkTreeView * view, GtkTreePath * path,
 {
 	Browser * browser = data;
 
+	if(GTK_TREE_VIEW(browser->detailview) != view)
+		return;
 	_default_do(browser, path);
 }
 
@@ -514,11 +516,12 @@ static void _default_do(Browser * browser, GtkTreePath * path)
 
 
 #if GTK_CHECK_VERSION(2, 6, 0)
-void on_icon_default(GtkIconView * view,
-		GtkTreePath * path, gpointer data)
+void on_icon_default(GtkIconView * view, GtkTreePath * path, gpointer data)
 {
 	Browser * browser = data;
 
+	if(GTK_ICON_VIEW(browser->iconview) != view)
+		return;
 	_default_do(browser, path);
 }
 #endif
@@ -610,7 +613,6 @@ void on_view_drag_data_received(GtkWidget * widget, GdkDragContext * context,
 		gint x, gint y, GtkSelectionData * seldata, guint info,
 		guint time, gpointer data)
 	/* FIXME - may not be an icon view
-	 *       - icon view may not be supported (< 2.6)
 	 *       - not fully checking if the source matches */
 {
 	Browser * browser = data;