diff --git a/public/js/actions/pause.js b/public/js/actions/pause.js
index edb7e25..dbb8649 100644
--- a/public/js/actions/pause.js
+++ b/public/js/actions/pause.js
@@ -20,7 +20,12 @@ function resumed() {
  */
 function paused(pauseInfo) {
   return ({ dispatch, getState, threadClient }) => {
-    dispatch(selectSource(pauseInfo.frame.location.sourceId));
+
+    const location = pauseInfo.frame.location;
+    dispatch(selectSource(location.sourceId, {
+      line: location.line
+    }));
+
     dispatch({
       type: constants.PAUSED,
       pauseInfo: pauseInfo
diff --git a/public/js/components/Editor.js b/public/js/components/Editor.js
index 8acfa98..24a306c 100644
--- a/public/js/components/Editor.js
+++ b/public/js/components/Editor.js
@@ -114,9 +114,6 @@ const Editor = React.createClass({
     if (nextProps.selectedSourceOpts &&
         nextProps.selectedSourceOpts.get("line")) {
       this.setDebugLine(nextProps.selectedSourceOpts.get("line"));
-    } else if (nextProps.pause &&
-               !nextProps.pause.get("isInterrupted")) {
-      this.setDebugLine(nextProps.pause.getIn(["frame", "location", "line"]));
     }
   },