Index: uspace/app/edit/edit.c
===================================================================
--- uspace/app/edit/edit.c	(revision 6c0766bd6d28fdd724ec6fc91a5f8bc38bbbd3f7)
+++ uspace/app/edit/edit.c	(revision e0cf963ea3be1b3230a964fb578b5efde4a79530)
@@ -928,5 +928,5 @@
 static void file_save_as(void)
 {
-//	const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";
+	const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";
 	ui_file_dialog_params_t fdparams;
 	ui_file_dialog_t *dialog;
@@ -935,5 +935,5 @@
 	ui_file_dialog_params_init(&fdparams);
 	fdparams.caption = "Save As";
-	// TODO: Set initial file name to old_fname
+	fdparams.ifname = old_fname;
 
 	rc = ui_file_dialog_create(edit.ui, &fdparams, &dialog);
@@ -1821,8 +1821,8 @@
 	pdparams.caption = reverse ? "Reverse Search" : "Search";
 	pdparams.prompt = "Search text";
-
-//	const char *default_value = "";
-//	if (pane.previous_search)
-//		default_value = pane.previous_search;
+	pdparams.itext = "";
+
+	if (pane.previous_search)
+		pdparams.itext = pane.previous_search;
 
 	rc = ui_prompt_dialog_create(edit.ui, &pdparams, &dialog);
Index: uspace/lib/ui/include/types/ui/filedialog.h
===================================================================
--- uspace/lib/ui/include/types/ui/filedialog.h	(revision 6c0766bd6d28fdd724ec6fc91a5f8bc38bbbd3f7)
+++ uspace/lib/ui/include/types/ui/filedialog.h	(revision e0cf963ea3be1b3230a964fb578b5efde4a79530)
@@ -49,4 +49,6 @@
 	/** Window caption */
 	const char *caption;
+	/** Initial file name */
+	const char *ifname;
 } ui_file_dialog_params_t;
 
Index: uspace/lib/ui/include/types/ui/promptdialog.h
===================================================================
--- uspace/lib/ui/include/types/ui/promptdialog.h	(revision 6c0766bd6d28fdd724ec6fc91a5f8bc38bbbd3f7)
+++ uspace/lib/ui/include/types/ui/promptdialog.h	(revision e0cf963ea3be1b3230a964fb578b5efde4a79530)
@@ -51,4 +51,6 @@
 	/** Prompt text */
 	const char *prompt;
+	/** Initial entry text */
+	const char *itext;
 } ui_prompt_dialog_params_t;
 
Index: uspace/lib/ui/src/filedialog.c
===================================================================
--- uspace/lib/ui/src/filedialog.c	(revision 6c0766bd6d28fdd724ec6fc91a5f8bc38bbbd3f7)
+++ uspace/lib/ui/src/filedialog.c	(revision e0cf963ea3be1b3230a964fb578b5efde4a79530)
@@ -76,4 +76,5 @@
 {
 	memset(params, 0, sizeof(ui_file_dialog_params_t));
+	params->ifname = "";
 }
 
@@ -159,5 +160,5 @@
 	label = NULL;
 
-	rc = ui_entry_create(window, "", &entry);
+	rc = ui_entry_create(window, params->ifname, &entry);
 	if (rc != EOK)
 		goto error;
@@ -183,4 +184,8 @@
 
 	ui_entry_activate(entry);
+
+	/* Select all */
+	ui_entry_seek_start(entry, false);
+	ui_entry_seek_end(entry, true);
 
 	dialog->ename = entry;
Index: uspace/lib/ui/src/promptdialog.c
===================================================================
--- uspace/lib/ui/src/promptdialog.c	(revision 6c0766bd6d28fdd724ec6fc91a5f8bc38bbbd3f7)
+++ uspace/lib/ui/src/promptdialog.c	(revision e0cf963ea3be1b3230a964fb578b5efde4a79530)
@@ -76,4 +76,5 @@
 {
 	memset(params, 0, sizeof(ui_prompt_dialog_params_t));
+	params->itext = "";
 }
 
@@ -159,5 +160,5 @@
 	label = NULL;
 
-	rc = ui_entry_create(window, "", &entry);
+	rc = ui_entry_create(window, params->itext, &entry);
 	if (rc != EOK)
 		goto error;
@@ -183,4 +184,8 @@
 
 	ui_entry_activate(entry);
+
+	/* Select all */
+	ui_entry_seek_start(entry, false);
+	ui_entry_seek_end(entry, true);
 
 	dialog->ename = entry;
