diff --git a/src/components/App.jsx b/src/components/App.jsx
index bac49eb..bd8f31f 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -227,6 +227,7 @@ export default class App extends React.Component {
 
     const toolbar = <Toolbar
       mapStyle={this.state.mapStyle}
+      inspectModeEnabled={this.state.inspectModeEnabled}
       sources={this.state.sources}
       onStyleChanged={this.onStyleChanged.bind(this)}
       onStyleOpen={this.onStyleChanged.bind(this)}
diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx
index 499d7a4..1898783 100644
--- a/src/components/Toolbar.jsx
+++ b/src/components/Toolbar.jsx
@@ -49,6 +49,7 @@ function ToolbarAction(props) {
 export default class Toolbar extends React.Component {
   static propTypes = {
     mapStyle: React.PropTypes.object.isRequired,
+    inspectModeEnabled: React.PropTypes.bool.isRequired,
     onStyleChanged: React.PropTypes.func.isRequired,
     // A new style has been uploaded
     onStyleOpen: React.PropTypes.func.isRequired,
@@ -128,7 +129,10 @@ export default class Toolbar extends React.Component {
       </ToolbarAction>
       <ToolbarAction onClick={this.props.onInspectModeToggle}>
         <InspectionIcon />
-        <IconText>Inspect</IconText>
+        <IconText>
+          { this.props.inspectModeEnabled && <span>Map Mode</span> }
+          { !this.props.inspectModeEnabled && <span>Inspect Mode</span> }
+        </IconText>
       </ToolbarAction>
       <ToolbarLink href={"https://github.com/maputnik/editor/wiki"}>
         <HelpIcon />