diff --git a/devtools/client/inspector/grids/components/Grid.js b/devtools/client/inspector/grids/components/Grid.js
index bd2f271ba206..add0840aaf6e 100644
--- a/devtools/client/inspector/grids/components/Grid.js
+++ b/devtools/client/inspector/grids/components/Grid.js
@@ -95,7 +95,7 @@ module.exports = createClass({
         {
           className: "layout-no-grids",
         },
-        getStr("layout.noGrids")
+        getStr("layout.noGridsOnThisPage")
       );
   },
 
diff --git a/devtools/client/inspector/layout/components/App.js b/devtools/client/inspector/layout/components/App.js
index bdb4b4d0154d..28126cf2b567 100644
--- a/devtools/client/inspector/layout/components/App.js
+++ b/devtools/client/inspector/layout/components/App.js
@@ -60,16 +60,6 @@ const App = createClass({
       },
       Accordion({
         items: [
-          {
-            header: BOXMODEL_L10N.getStr("boxmodel.title"),
-            component: BoxModel,
-            componentProps: this.props,
-            opened: Services.prefs.getBoolPref(BOXMODEL_OPENED_PREF),
-            onToggled: () => {
-              let opened = Services.prefs.getBoolPref(BOXMODEL_OPENED_PREF);
-              Services.prefs.setBoolPref(BOXMODEL_OPENED_PREF, !opened);
-            }
-          },
           {
             header: LAYOUT_L10N.getStr("layout.header"),
             component: Grid,
@@ -80,6 +70,16 @@ const App = createClass({
               Services.prefs.setBoolPref(GRID_OPENED_PREF, !opened);
             }
           },
+          {
+            header: BOXMODEL_L10N.getStr("boxmodel.title"),
+            component: BoxModel,
+            componentProps: this.props,
+            opened: Services.prefs.getBoolPref(BOXMODEL_OPENED_PREF),
+            onToggled: () => {
+              let opened = Services.prefs.getBoolPref(BOXMODEL_OPENED_PREF);
+              Services.prefs.setBoolPref(BOXMODEL_OPENED_PREF, !opened);
+            }
+          },
         ]
       })
     );
diff --git a/devtools/client/locales/en-US/layout.properties b/devtools/client/locales/en-US/layout.properties
index ef709ec84a15..1eb44f8687ee 100644
--- a/devtools/client/locales/en-US/layout.properties
+++ b/devtools/client/locales/en-US/layout.properties
@@ -31,9 +31,9 @@ layout.header=Grid
 # settings container in the CSS Grid pane.
 layout.gridDisplaySettings=Grid Display Settings
 
-# LOCALIZATION NOTE (layout.noGrids): In the case where there are no CSS grid
+# LOCALIZATION NOTE (layout.noGridsOnThisPage): In the case where there are no CSS grid
 # containers to display.
-layout.noGrids=No grids
+layout.noGridsOnThisPage=CSS Grid is not in use on this page
 
 # LOCALIZATION NOTE (layout.overlayMultipleGrids): The header for the list of grid
 # container elements that can be highlighted in the CSS Grid pane.