diff --git a/browser/devtools/debugger/debugger-toolbar.js b/browser/devtools/debugger/debugger-toolbar.js
index 94298fc84fb..ebec753ba35 100644
--- a/browser/devtools/debugger/debugger-toolbar.js
+++ b/browser/devtools/debugger/debugger-toolbar.js
@@ -668,7 +668,7 @@ let StackFrameUtils = {
   getFrameTitle: function(aFrame) {
     if (aFrame.type == "call") {
       let c = aFrame.callee;
-      return (c.name || c.userDisplayName || c.displayName || "(anonymous)");
+      return (c.userDisplayName || c.displayName || c.name || "(anonymous)");
     }
     return "(" + aFrame.type + ")";
   },
@@ -702,7 +702,7 @@ let StackFrameUtils = {
       case "function":
         let f = aEnv.function;
         label += " [" +
-          (f.name || f.userDisplayName || f.displayName || "(anonymous)") +
+          (f.userDisplayName || f.displayName || f.name || "(anonymous)") +
         "]";
         break;
     }
diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index a6953eeee32..02cba4e1965 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -2549,7 +2549,8 @@ ObjectActor.prototype = {
     if (this.obj.class === "Function") {
       if (this.obj.name) {
         g.name = this.obj.name;
-      } else if (this.obj.displayName) {
+      }
+      if (this.obj.displayName) {
         g.displayName = this.obj.displayName;
       }
 
diff --git a/toolkit/devtools/server/tests/unit/test_functiongrips-01.js b/toolkit/devtools/server/tests/unit/test_functiongrips-01.js
index 00dfb19737a..8c3ba605c89 100644
--- a/toolkit/devtools/server/tests/unit/test_functiongrips-01.js
+++ b/toolkit/devtools/server/tests/unit/test_functiongrips-01.js
@@ -30,6 +30,7 @@ function test_named_function()
 
     do_check_eq(args[0].class, "Function");
     do_check_eq(args[0].name, "stopMe");
+    do_check_eq(args[0].displayName, "stopMe");
 
     let objClient = gThreadClient.pauseGrip(args[0]);
     objClient.getParameterNames(function(aResponse) {