diff --git a/src/browser/components/HoveringURL.jsx b/src/browser/components/HoveringURL.jsx
index fcab6dd3..f6c3526b 100644
--- a/src/browser/components/HoveringURL.jsx
+++ b/src/browser/components/HoveringURL.jsx
@@ -2,10 +2,6 @@ const React = require('react');
 const PropTypes = require('prop-types');
 
 function HoveringURL(props) {
-  if (props.targetURL.startsWith(props.currentTeamURL)) {
-    return <div/>;
-  }
-
   return (
     <div className='HoveringURL HoveringURL-left'>
       {props.targetURL}
@@ -14,7 +10,6 @@ function HoveringURL(props) {
 }
 
 HoveringURL.propTypes = {
-  currentTeamURL: PropTypes.string,
   targetURL: PropTypes.string,
 };
 
diff --git a/src/browser/components/MainPage.jsx b/src/browser/components/MainPage.jsx
index 408664fe..85e26e60 100644
--- a/src/browser/components/MainPage.jsx
+++ b/src/browser/components/MainPage.jsx
@@ -317,6 +317,7 @@ const MainPage = createReactClass({
       authServerURL = `${tmpURL.protocol}//${tmpURL.host}`;
       authInfo = this.state.loginQueue[0].authInfo;
     }
+    var currentTeamURL = this.props.teams[this.state.key].url;
     var modal = (
       <NewTeamModal
         show={this.state.showNewTeamModal}
@@ -364,7 +365,7 @@ const MainPage = createReactClass({
           { viewsRow }
         </Grid>
         <TransitionGroup>
-          { (this.state.targetURL === '') ?
+          { (this.state.targetURL === '' || this.state.targetURL.startsWith(currentTeamURL)) ?
             null :
             <CSSTransition
               classNames='hovering'
@@ -372,7 +373,6 @@ const MainPage = createReactClass({
             >
               <HoveringURL
                 key='hoveringURL'
-                currentTeamURL={this.props.teams[this.state.key].url}
                 targetURL={this.state.targetURL}
               />
             </CSSTransition>