Index: gnome-dictionary/src/gdict-window.c
===================================================================
--- gnome-dictionary/src/gdict-window.c	(revision 7979)
+++ gnome-dictionary/src/gdict-window.c	(working copy)
@@ -947,8 +947,11 @@ gdict_window_cmd_edit_copy (GtkAction   
 {
   g_assert (GDICT_IS_WINDOW (window));
 
-  gdict_defbox_copy_to_clipboard (GDICT_DEFBOX (window->defbox),
-		  		  gtk_clipboard_get (GDK_SELECTION_CLIPBOARD));
+  if (GTK_WIDGET_HAS_FOCUS (window->entry))
+    gtk_editable_copy_clipboard (GTK_EDITABLE (window->entry));
+  else
+    gdict_defbox_copy_to_clipboard (GDICT_DEFBOX (window->defbox),
+		  		    gtk_clipboard_get (GDK_SELECTION_CLIPBOARD));
 }
 
 static void
@@ -957,7 +960,10 @@ gdict_window_cmd_edit_select_all (GtkAct
 {
   g_assert (GDICT_IS_WINDOW (window));
 
-  gdict_defbox_select_all (GDICT_DEFBOX (window->defbox));
+  if (GTK_WIDGET_HAS_FOCUS (window->entry))
+    gtk_editable_select_region(GTK_EDITABLE(window->entry), 0, -1);
+  else
+    gdict_defbox_select_all (GDICT_DEFBOX (window->defbox));
 }
 
 static void
