diff --git a/src/bin/browser.c b/src/bin/browser.c
index a8f8c1d..4652f56 100644
--- a/src/bin/browser.c
+++ b/src/bin/browser.c
@@ -223,10 +223,14 @@ _cb_file_selected(void *data, Evas_Object *obj, const char *sig EINA_UNUSED, con
 {
    Evas_Object *win = data;
    Entry *entry = evas_object_data_get(obj, "entry");
+   char buf[PATH_MAX];
    const char *file = evas_object_data_get(obj, "file");
 
    elm_layout_signal_emit(obj, "rage,state,selected", "rage");
    _activate(win, entry, file);
+   snprintf(buf, sizeof(buf), "%s/%s", entry->path, file);
+   if (selfile) free(selfile);
+   selfile = strdup(buf);
 }
 
 static void
@@ -750,9 +754,14 @@ _sel_do(Evas_Object *win, Entry *base_entry)
         const char *file = _sel_file_find(entry);
         if (file)
           {
+             char buf[PATH_MAX];
+
              elm_layout_signal_emit(o, "rage,state,selected", "rage");
              _activate(win, entry, file);
-          }
+             snprintf(buf, sizeof(buf), "%s/%s", entry->path, file);
+             if (selfile) free(selfile);
+             selfile = strdup(buf);
+         }
         eina_lock_release(&(entry->lock));
      }
 }
diff --git a/src/bin/dnd.c b/src/bin/dnd.c
index c14643a..f88ce9c 100644
--- a/src/bin/dnd.c
+++ b/src/bin/dnd.c
@@ -1,4 +1,5 @@
 #include <Elementary.h>
+#include <Emotion.h>
 #include <Eio.h>
 #include "main.h"
 #include "win.h"