--- filebrowser.module-origin
+++ filebrowser.module
@@ -396,7 +396,7 @@
       $links['file_browser_metadata'] = array(
         'href' => "filebrowser/metadata/{$node->file_listing['.']['fid']}",
         'title' => t("Edit Metadatas"),
-        'query' => 'destination=' . urlencode(request_uri())
+        'query' => 'destination=' . urlencode(drupal_get_path_alias($_GET['q']))
       );
       $thumbnailers = module_implements("filebrowser_thumbnailer_prepare");
       if (count($thumbnailers) != 0) {