diff --git a/package.json b/package.json
index 75c4e653..d00d59cf 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "package:mac": "build --mac --x64 --ia32",
     "package:linux": "build --linux --x64 --ia32 --em.name=mattermost-desktop",
     "manipulate-windows-zip": "node scripts/manipulate_windows_zip.js",
-    "lint:js": "eslint ."
+    "lint:js": "eslint --ext .js --ext .jsx ."
   },
   "devDependencies": {
     "7zip-bin": "^2.0.1",
diff --git a/src/browser/components/loginModal.jsx b/src/browser/components/loginModal.jsx
index 1ddb2d51..50c48e04 100644
--- a/src/browser/components/loginModal.jsx
+++ b/src/browser/components/loginModal.jsx
@@ -83,7 +83,7 @@ const LoginModal = React.createClass({
           </Form>
         </Modal.Body>
       </Modal>
-      );
+    );
   }
 });
 
diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 29bf0d08..89f08dc7 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -293,7 +293,7 @@ var MainPage = React.createClass({
           { viewsRow }
         </Grid>
       </div>
-      );
+    );
   }
 });
 
@@ -372,7 +372,7 @@ var TabBar = React.createClass({
       >
         { tabs }
       </Nav>
-      );
+    );
   }
 });
 
@@ -664,7 +664,7 @@ var ErrorView = React.createClass({
           </div>
         </div>
       </Grid>
-      );
+    );
   }
 });
 
diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index 3fc615d0..8e11e663 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -393,7 +393,7 @@ var SettingsPage = React.createClass({
           </div>
         </Navbar>
       </div>
-      );
+    );
   }
 });
 
@@ -466,7 +466,7 @@ var TeamList = React.createClass({
           onTeamRemove={handleTeamRemove}
           onTeamEditing={handleTeamEditing}
         />
-        );
+      );
     });
 
     var addTeamForm;
@@ -488,7 +488,7 @@ var TeamList = React.createClass({
         { teamNodes }
         { addTeamForm }
       </ListGroup>
-      );
+    );
   }
 });
 
@@ -525,7 +525,7 @@ var TeamListItem = React.createClass({
           >{'Remove'}</a>
         </div>
       </div>
-      );
+    );
   }
 });
 
@@ -661,7 +661,7 @@ var TeamListItemNew = React.createClass({
           return null;
         })() }
       </ListGroupItem>
-      );
+    );
   }
 });