diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 1740b34e..9c10648f 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -306,7 +306,7 @@ var MattermostView = React.createClass({
     if (this.state.did_fail_load === null) {
       return (<webview id={ this.props.id } className="mattermostView" style={ this.props.style } preload="webview/mattermost.js" src={ this.props.src } ref="webview"></webview>);
     } else {
-      return (<ErrorView errorInfo={ this.state.did_fail_load } style={ this.props.style }></ErrorView>)
+      return (<ErrorView id={ this.props.id + '-fail' } className="errorView" errorInfo={ this.state.did_fail_load } style={ this.props.style }></ErrorView>)
     }
   }
 });
@@ -316,7 +316,7 @@ var MattermostView = React.createClass({
 var ErrorView = React.createClass({
   render: function() {
     return (
-      <Grid fluid style={ this.props.style }>
+      <Grid id={ this.props.id } style={ this.props.style }>
         <h1>Failed to load the URL</h1>
         <p>
           { 'URL: ' }
diff --git a/test/browser_test.js b/test/browser_test.js
index a30ae701..33bb44fb 100644
--- a/test/browser_test.js
+++ b/test/browser_test.js
@@ -166,6 +166,21 @@ describe('electron-mattermost', function() {
         })
         .end();
     });
+
+    it('should show error when using incorrect URL', function() {
+      this.timeout(30000)
+      fs.writeFileSync(config_file_path, JSON.stringify({
+        version: 1,
+        teams: [{
+          name: 'error_1',
+          url: 'http://false'
+        }]
+      }));
+      return client
+        .init()
+        .waitForVisible('#mattermostView0-fail', 20000)
+        .end();
+    });
   });
 
   describe('settings.html', function() {