diff --git a/libnemo-private/nemo-file.c b/libnemo-private/nemo-file.c
index 72a8a6011..39aee16cf 100644
--- a/libnemo-private/nemo-file.c
+++ b/libnemo-private/nemo-file.c
@@ -4156,6 +4156,13 @@ nemo_file_peek_display_name (NemoFile *file)
 		}
 	}
 
+	/* When enabled, always show the actual filename instead of any custom
+	 * display name (e.g. the Name field inside .desktop files). */
+	if (file->details->name != NULL &&
+	    g_settings_get_boolean (nemo_preferences, NEMO_PREFERENCES_SHOW_REAL_FILENAME)) {
+		return file->details->name;
+	}
+
 	return file->details->display_name;
 }
 
diff --git a/libnemo-private/nemo-global-preferences.h b/libnemo-private/nemo-global-preferences.h
index 91f404854..6465b48c6 100644
--- a/libnemo-private/nemo-global-preferences.h
+++ b/libnemo-private/nemo-global-preferences.h
@@ -41,6 +41,7 @@ G_BEGIN_DECLS
 
 /* Display  */
 #define NEMO_PREFERENCES_SHOW_HIDDEN_FILES			"show-hidden-files"
+#define NEMO_PREFERENCES_SHOW_REAL_FILENAME			"show-real-filename"
 #define NEMO_PREFERENCES_SHOW_ADVANCED_PERMISSIONS		"show-advanced-permissions"
 #define NEMO_PREFERENCES_DATE_FORMAT            "date-format"
 #define NEMO_PREFERENCES_DATE_FONT_CHOICE  "date-font-choice"
diff --git a/libnemo-private/org.nemo.gschema.xml b/libnemo-private/org.nemo.gschema.xml
index abc2814d4..b5af42de3 100644
--- a/libnemo-private/org.nemo.gschema.xml
+++ b/libnemo-private/org.nemo.gschema.xml
@@ -321,6 +321,11 @@
       <summary>Whether to show hidden files</summary>
       <description>If set to true, then hidden files are shown by default in the file manager.  Hidden files are either dotfiles, listed in the folder's .hidden file or backup files ending with a tilde (~).</description>
     </key>
+    <key name="show-real-filename" type="b">
+      <default>false</default>
+      <summary>Whether to show files by their actual filename</summary>
+      <description>If set to true, all files will be displayed using their actual filename instead of any custom display name (such as the Name field inside .desktop files).</description>
+    </key>
     <key name="show-full-path-titles" type="b">
       <default>false</default>
       <summary>Whether to show the full path of the current view in the title bar and tab bars</summary>