diff --git a/src/LyricsPane.js b/src/LyricsPane.js
index 4457d97..a507965 100644
--- a/src/LyricsPane.js
+++ b/src/LyricsPane.js
@@ -35,7 +35,14 @@ class LyricsPane extends Component {
 
   renderLine = (line, idx) => {
     var words = line.map(this.renderWord);
-    return <div key={idx}>{words}</div>;
+    var x = [];
+    // Hack to put spaces between word spans. We could just put them in the spans
+    // themselves, but then we get funny underlining behaviour.
+    for (let word of words) {
+      x.push(word);
+      x.push(" ");
+    }
+    return <div key={idx}>{x.slice(0,-1)}</div>;
   }
 
   onTextEdit = () => {
@@ -124,7 +131,8 @@ class LyricsPane extends Component {
       var lines = this.props.verse.lines.map(this.renderLine);
       filling = (
             <div className="words lyrics" 
-              onClick={this.props.verse && this.props.verse.isCustom() && this.startEditing} >
+              onClick={this.props.verse && this.props.verse.isCustom() && this.startEditing} 
+            >
               {this.props.loading &&
                 <h3>Loading...</h3>
               }
diff --git a/src/Word.js b/src/Word.js
index f246d8b..c7b4cd2 100644
--- a/src/Word.js
+++ b/src/Word.js
@@ -18,7 +18,7 @@ class Word extends Component {
     var kls = "word" + (this.props.focus ? " "+this.props.focus : "");
     return (<span className={kls} onMouseEnter={this.onEnter}
              onMouseLeave={this.onLeave}>
-              {this.props.raw}{" "}
+              {this.props.raw}
             </span>);
   }