diff --git a/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee b/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee
index ff744ab65..59a068003 100644
--- a/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee
@@ -243,80 +243,88 @@ mixins.push(Reflux.listenTo(JamTrackStore, 'onJamTrackChanged'))
errorHtml = context.JK.reactErrors(@state.createMixdownErrors, {name: 'Mix Name', settings: 'Settings', jam_track: 'JamTrack'})
createMixClasses = classNames({'button-orange' : true, 'create-mix-btn' : true, 'disabled' : @state.creatingMixdown})
- mixControls = `
-
-
Use the JamTrack controls on the session screen to set levels, mute/unmute, or pan any of the parts of the JamTrack as you like. You can also use the controls below to adjust the tempo or pitch of the JamTrack. Then give your custom mix a name, and click the Create Mix button. Please note that changing the tempo or pitch of the JamTrack may take a long time, and won't be ready right away.
-
- Change Tempo:
-
- No change
- ------------
- Slower by 5%
- Slower by 10%
- Slower by 15%
- Slower by 20%
- Slower by 25%
- Slower by 30%
- Slower by 35%
- Slower by 40%
- Slower by 45%
- Slower by 50%
- Slower by 60%
- Slower by 70%
- Slower by 80%
- ------------
- Faster by 5%
- Faster by 10%
- Faster by 15%
- Faster by 20%
- Faster by 30%
- Faster by 40%
- Faster by 50%
-
-
-
- Change Pitch:
-
- No change
- ---------------
- Down 1 Semitone
- Down 2 Semitones
- Down 3 Semitones
- Down 4 Semitones
- Down 5 Semitones
- Down 6 Semitones
- Down 7 Semitones
- Down 8 Semitones
- Down 9 Semitones
- Down 10 Semitones
- Down 11 Semitones
- Down 12 Semitones
- ---------------
- Up 1 Semitone
- Up 2 Semitones
- Up 3 Semitones
- Up 4 Semitones
- Up 5 Semitones
- Up 6 Semitones
- Up 7 Semitones
- Up 8 Semitones
- Up 9 Semitones
- Up 10 Semitones
- Up 11 Semitones
- Up 12 Semitones
-
-
-
- Mix Name:
-
-
-
-
-
`
+ if !selectedMixdown?
+ mixControls = `
+
+
Use the JamTrack controls on the session screen to set levels, mute/unmute, or pan any of the parts of the JamTrack as you like. You can also use the controls below to adjust the tempo or pitch of the JamTrack. Then give your custom mix a name, and click the Create Mix button. Please note that changing the tempo or pitch of the JamTrack may take a long time, and won't be ready right away.
+
+ Change Tempo:
+
+ No change
+ ------------
+ Slower by 5%
+ Slower by 10%
+ Slower by 15%
+ Slower by 20%
+ Slower by 25%
+ Slower by 30%
+ Slower by 35%
+ Slower by 40%
+ Slower by 45%
+ Slower by 50%
+ Slower by 60%
+ Slower by 70%
+ Slower by 80%
+ ------------
+ Faster by 5%
+ Faster by 10%
+ Faster by 15%
+ Faster by 20%
+ Faster by 30%
+ Faster by 40%
+ Faster by 50%
+
+
+
+ Change Pitch:
+
+ No change
+ ---------------
+ Down 1 Semitone
+ Down 2 Semitones
+ Down 3 Semitones
+ Down 4 Semitones
+ Down 5 Semitones
+ Down 6 Semitones
+ Down 7 Semitones
+ Down 8 Semitones
+ Down 9 Semitones
+ Down 10 Semitones
+ Down 11 Semitones
+ Down 12 Semitones
+ ---------------
+ Up 1 Semitone
+ Up 2 Semitones
+ Up 3 Semitones
+ Up 4 Semitones
+ Up 5 Semitones
+ Up 6 Semitones
+ Up 7 Semitones
+ Up 8 Semitones
+ Up 9 Semitones
+ Up 10 Semitones
+ Up 11 Semitones
+ Up 12 Semitones
+
+
+
+ Mix Name:
+
+
+
+
+
+
`
+ else
+
+ mixControls =
+ `
+
To create a custom mix, you must open the Full JamTrack in the My Mixes section above.
+
`
if @state.showMyMixes
showMyMixesText = `hide my mixes
`
diff --git a/web/app/assets/stylesheets/minimal/media_controls.css.scss b/web/app/assets/stylesheets/minimal/media_controls.css.scss
index b8079dd95..8545aea86 100644
--- a/web/app/assets/stylesheets/minimal/media_controls.css.scss
+++ b/web/app/assets/stylesheets/minimal/media_controls.css.scss
@@ -183,6 +183,10 @@ body.media-controls-popup.popup {
border-width:1px 0;
padding: 7px 0 20px;
+ &.not-active {
+ padding:7px 0 7px;
+ }
+
p {
line-height:125%;
color:$ColorTextTypical;