diff --git a/data/eog-toolbar.xml b/data/eog-toolbar.xml
index 38e895c..348f417 100644
--- a/data/eog-toolbar.xml
+++ b/data/eog-toolbar.xml
@@ -2,7 +2,8 @@
 <toolbars version="1.0">
 <available>
     <toolitem name="ImageOpen"/>
-    <toolitem name="ImageSave"/>
+	<toolitem name="ImageSave"/>
+	<toolitem name="ImageOpenContainingFolder"/>
     <toolitem name="ImagePrint"/>
     <toolitem name="ImageProperties"/>
     <toolitem name="ViewImageCollection"/>
@@ -30,6 +31,8 @@
     <toolitem name="ViewZoomFit"/>
     <separator/>
     <toolitem name="EditRotate270"/>
-    <toolitem name="EditRotate90"/>
+	<toolitem name="EditRotate90"/>
+	<separator/>
+    <toolitem name="ImageOpenContainingFolder"/>
  </toolbar>
 </toolbars>
diff --git a/data/eog-ui.xml b/data/eog-ui.xml
index 7673cd6..0833707 100644
--- a/data/eog-ui.xml
+++ b/data/eog-ui.xml
@@ -7,7 +7,8 @@
       </menu>
       <separator/>
       <menuitem action="ImageSave"/>
-      <menuitem action="ImageSaveAs"/>
+	  <menuitem action="ImageSaveAs"/> 
+      <menuitem action="ImageOpenContainingFolder"/>
       <separator/>
       <menuitem action="ImagePrint"/>
       <separator/>
@@ -83,6 +84,7 @@
     <separator/>
     <toolitem action="EditRotate270"/>
     <toolitem action="EditRotate90"/>
+	<toolitem action="ImageOpenContainingFolder"/>
   </toolbar>
   <toolbar name="FullscreenToolbar">
     <toolitem action="GoFirst"/>
@@ -110,6 +112,7 @@
     <separator/>
     <menuitem action="ImageSave"/>
     <menuitem action="ImageSaveAs"/>
+	<menuitem action="ImageOpenContainingFolder"/>
     <separator/>
     <menuitem action="ImagePrint"/>
     <separator/>
@@ -126,6 +129,7 @@
     <separator/>
     <menuitem action="ImageSave"/>
     <menuitem action="ImageSaveAs"/>
+	<menuitem action="ImageOpenContainingFolder"/>
     <separator/>
     <menuitem action="ImagePrint"/>
     <separator/>
diff --git a/src/eog-window.c b/src/eog-window.c
index a490d00..6da4947 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -3272,6 +3272,53 @@ eog_window_cmd_save_as (GtkAction *action, gpointer user_data)
 }
 
 static void
+eog_window_cmd_open_containing_folder (GtkAction *action, gpointer user_data)
+{
+	EogWindow *window = EOG_WINDOW (user_data);
+	EogWindowPrivate *priv;
+	
+	GtkWidget *eog_window_widget;
+  
+	GFile *file;
+	GFile *parent;
+	
+	eog_window_widget = GTK_WIDGET (window);	
+	priv = window->priv;
+
+	file = eog_image_get_file (priv->image);
+	parent = g_file_get_parent (file);
+
+	if (parent) {
+		char *parent_uri;
+
+		parent_uri = g_file_get_uri (parent);
+		if (parent_uri) {
+			GdkScreen *screen;
+			guint32 timestamp;
+			GError *error;
+
+			screen = gtk_widget_get_screen (eog_window_widget);
+			timestamp = gtk_get_current_event_time ();
+
+			error = NULL;
+			if (!gtk_show_uri (screen, parent_uri, timestamp, &error)) {
+				eog_debug_message (DEBUG_WINDOW, "Could not open the containing folder");
+				g_error_free (error);
+			}
+
+			g_free (parent_uri);
+		}
+	}
+
+	if (file)
+		g_object_unref (file);
+
+	if (parent)
+		g_object_unref (parent);
+
+}
+
+static void
 eog_window_cmd_print (GtkAction *action, gpointer user_data)
 {
 	EogWindow *window = EOG_WINDOW (user_data);
@@ -3948,6 +3995,9 @@ static const GtkActionEntry action_entries_image[] = {
 	{ "ImageSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As…"), "<control><shift>s",
 	  N_("Save the selected images with a different name"),
 	  G_CALLBACK (eog_window_cmd_save_as) },
+	{ "ImageOpenContainingFolder", GTK_STOCK_DIRECTORY, N_("Open Containing _Folder"), NULL,
+	  N_("Show the folder which contains this file in the file manager"),
+	  G_CALLBACK (eog_window_cmd_open_containing_folder) },
 	{ "ImagePrint", GTK_STOCK_PRINT, N_("_Print…"), "<control>p",
 	  N_("Print the selected image"),
 	  G_CALLBACK (eog_window_cmd_print) },
@@ -4118,6 +4168,9 @@ set_action_properties (GtkActionGroup *window_group,
         action = gtk_action_group_get_action (image_group, "EditRotate270");
         g_object_set (action, "short_label", _("Left"), NULL);
 
+		action = gtk_action_group_get_action (window_group, "ImageOpenContainingFolder");
+		g_object_set (action, "short_label", _("Open Folder"), NULL);
+
         action = gtk_action_group_get_action (image_group, "ViewZoomIn");
         g_object_set (action, "short_label", _("In"), NULL);
 
