diff --git a/gtk/add-dialog.c b/gtk/add-dialog.c
index f31cc888f..24beea347 100644
--- a/gtk/add-dialog.c
+++ b/gtk/add-dialog.c
@@ -519,7 +519,7 @@ addURLDialog( GtkWindow * parent, TrCore * core )
     GtkWidget * w;
 
     w = gtk_dialog_new_with_buttons( _( "Add URL" ), parent,
-                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+                                     GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                      GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
                                      NULL );
diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 221e3403d..1a6f4b7a5 100644
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -2726,6 +2726,8 @@ refreshCurrentDir( tr_torrent * tor )
 
     if( tor->incompleteDir == NULL )
         dir = tor->downloadDir;
+    else if( !tr_torrentHasMetadata( tor ) ) /* no files to find */
+        dir = tor->incompleteDir;
     else if( !tr_torrentFindFile2( tor, 0, &dir, &sub ) )
         dir = tor->incompleteDir;