diff --git a/libnemo-private/nemo-file-conflict-dialog.c b/libnemo-private/nemo-file-conflict-dialog.c
index 70b28b746..a71974579 100644
--- a/libnemo-private/nemo-file-conflict-dialog.c
+++ b/libnemo-private/nemo-file-conflict-dialog.c
@@ -566,6 +566,7 @@ nemo_file_conflict_dialog_init (NemoFileConflictDialog *fcd)
 				       _("Re_name"),
 				       CONFLICT_RESPONSE_RENAME);
 	gtk_widget_hide (details->rename_button);
+	gtk_widget_set_no_show_all(details->rename_button, TRUE);
 
 	details->replace_button =
 		gtk_dialog_add_button (dialog,
@@ -622,6 +623,7 @@ nemo_file_conflict_dialog_class_init (NemoFileConflictDialogClass *klass)
 char *
 nemo_file_conflict_dialog_get_new_name (NemoFileConflictDialog *dialog)
 {
+	g_assert(gtk_entry_get_text_length (GTK_ENTRY (dialog->details->entry)) > 0);
 	return g_strdup (gtk_entry_get_text
 			 (GTK_ENTRY (dialog->details->entry)));
 }