diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js
index 4983e6410..1b2ae2dba 100644
--- a/web/app/assets/javascripts/jam_rest.js
+++ b/web/app/assets/javascripts/jam_rest.js
@@ -1448,7 +1448,6 @@
         }
 
         function getJamTracks(options) {
-          logger.debug("GETTING JAMTRACKS")
           return $.ajax({
             type: "GET",
             url: '/api/jamtracks?' + $.param(options),
diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js
index 07c9ce4fb..c4d976dd8 100644
--- a/web/app/assets/javascripts/session.js
+++ b/web/app/assets/javascripts/session.js
@@ -416,7 +416,7 @@
                     }
                     else {
                         displayDoneRecording();
-                        promptUserToSave(data.recordingId);
+                        promptUserToSave(data.recordingId, timeline);
                     }
 
                 })
@@ -545,10 +545,12 @@
 
       function checkJamTrackTransition(currentSession) {
         // handle jam tracks
-        if (jamTrack == null && (currentSession && currentSession.jam_track != null)) {
+
+        // if we have a recording open, then don't go into JamTrack monitor mode even if a JamTrack is open
+        if (jamTrack == null && (currentSession && currentSession.jam_track != null && currentSession.claimed_recording == null)) {
           playbackControls.startMonitor(context.JK.PLAYBACK_MONITOR_MODE.JAMTRACK);
         }
-        else if (jamTrack && (currentSession == null || currentSession.jam_track == null)) {
+        else if (jamTrack && (currentSession == null || (currentSession.jam_track == null && currentSession.claimed_recording == null))) {
           playbackControls.stopMonitor();
         }
         jamTrack = currentSession == null ? null : currentSession.jam_track;
@@ -725,7 +727,7 @@
             masterMixers = context.jamClient.SessionGetAllControlState(true);
             personalMixers = context.jamClient.SessionGetAllControlState(false);
 
-            logger.debug("masterMixers", masterMixers)
+            //logger.debug("masterMixers", masterMixers)
             //logger.debug("personalMixers", personalMixers)
 
             mixersByResourceId = {}
@@ -2578,9 +2580,10 @@
             }
         }
 
-        function promptUserToSave(recordingId) {
+        function promptUserToSave(recordingId, timeline) {
             rest.getRecording( {id: recordingId} )
                 .done(function(recording) {
+                    recording.timeline = timeline.global
                     recordingFinishedDialog.setRecording(recording);
                     app.layout.showDialog('recordingFinished').one(EVENTS.DIALOG_CLOSED, function(e, data) {
                       if(data.result && data.result.keep){
@@ -2592,7 +2595,7 @@
         }
 
         function checkPendingMetronome() {
-          logger.debug("checkPendingMetronome", sessionModel.isMetronomeOpen(), getMetronomeMasterMixers().length)
+          //logger.debug("checkPendingMetronome", sessionModel.isMetronomeOpen(), getMetronomeMasterMixers().length)
           if(sessionModel.isMetronomeOpen() && getMetronomeMasterMixers().length == 0) {
             var pendingMetronome = $($templatePendingMetronome.html())
 
diff --git a/web/app/assets/stylesheets/dialogs/openJamTrackDialog.css.scss b/web/app/assets/stylesheets/dialogs/openJamTrackDialog.css.scss
index b13355afe..38b761750 100644
--- a/web/app/assets/stylesheets/dialogs/openJamTrackDialog.css.scss
+++ b/web/app/assets/stylesheets/dialogs/openJamTrackDialog.css.scss
@@ -31,7 +31,7 @@
     left: 15%;
     font-size: 12px;
     padding-top:5px;
-    z-index:-1;
+    z-index:0;
 
     a {
       margin:0 10px;
diff --git a/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss b/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss
index b8f27aede..5d1b6b802 100644
--- a/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss
+++ b/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss
@@ -20,6 +20,11 @@
     position:absolute;
   }
 
+
+  .jam-track-get-ready {
+    display:none;
+  }
+
   .icheckbuttons {
     margin-top:20px;
   }