Merge pull request #660 from marrus-sh/mastodon-smart-back-button

#467 – Making the back button a little smarter

app/assets/javascripts/components/components/column_back_button.jsx

@@ -15,7 +15,8 @@ const ColumnBackButton = React.createClass({
   mixins: [PureRenderMixin],
 
   handleClick () {
-    this.context.router.goBack();
+    if (window.history && window.history.length == 1) this.context.router.push("/");
+    else this.context.router.goBack();
   },
 
   render () {