diff --git a/LiftLog.Ui/Shared/Presentation/WeightedExercise.razor b/LiftLog.Ui/Shared/Presentation/WeightedExercise.razor
index 7c2cc704..275f2c68 100644
--- a/LiftLog.Ui/Shared/Presentation/WeightedExercise.razor
+++ b/LiftLog.Ui/Shared/Presentation/WeightedExercise.razor
@@ -12,7 +12,10 @@
             @if(!IsReadonly)
             {
                 <div class="flex justify-end">
-                    <IconButton data-cy="prev-exercise-btn" Type="IconButtonType.Standard" Icon="history" OnClick="ShowPrevious"/>
+                    @if(ShowPreviousButton)
+                    {
+                        <IconButton data-cy="prev-exercise-btn" Type="IconButtonType.Standard" Icon="history" OnClick="ShowPrevious"/>
+                    }
                     <IconButton data-cy="per-rep-weight-btn" Type=IconButtonType.Standard Icon=weight OnClick="ToggleExercisePerSetWeight"></IconButton>
                     <div>
                         <IconButton data-cy="more-exercise-btn" class="self-end" Type="IconButtonType.Standard" OnClick="() => { _menu?.Open(); }" Icon="more_horiz" id="@moreButtonId"/>
@@ -143,6 +146,8 @@
 
     [Parameter] public bool IsReadonly { get; set; } = false;
 
+    [EditorRequired] [Parameter] public bool ShowPreviousButton { get; set; }
+
     private void HandleNotesChange(string value)
     {
         EditorNotes = value;
diff --git a/LiftLog.Ui/Shared/Smart/SessionComponent.razor b/LiftLog.Ui/Shared/Smart/SessionComponent.razor
index ed10a09a..cb28644b 100644
--- a/LiftLog.Ui/Shared/Smart/SessionComponent.razor
+++ b/LiftLog.Ui/Shared/Smart/SessionComponent.razor
@@ -34,7 +34,8 @@ else
             UpdateNotesForExercise=@((notes) => UpdateNotesForExercise(context.Index, notes))
             OnEditExercise=@(() => BeginEditExercise(context.Index))
             OnRemoveExercise=@(() => BeginRemoveExercise(context.Index))
-            IsReadonly=IsReadonly />
+            IsReadonly=IsReadonly
+            ShowPreviousButton=@(SessionTarget == SessionTarget.WorkoutSession) />
     </ItemList>
 }
 @if (ShowBodyweight)
@@ -78,7 +79,9 @@ else
 @if(IsInActiveScreen && !IsReadonly)
 {
     <Microsoft.AspNetCore.Components.Sections.SectionContent SectionName="TrailingTitleButton">
-        <AppButton class="text-lg" Type=AppButtonType.Text OnClick=SaveSession>Finish</AppButton>
+        <AppButton class="text-lg" Type=AppButtonType.Text OnClick=SaveSession>
+            @(SessionTarget == SessionTarget.WorkoutSession ? "Finish" : "Save")
+        </AppButton>
     </Microsoft.AspNetCore.Components.Sections.SectionContent>
 }