diff --git a/packages/edit-site/src/components/save-button/index.js b/packages/edit-site/src/components/save-button/index.js
index 01a8972fc2331..ecf8585e6599f 100644
--- a/packages/edit-site/src/components/save-button/index.js
+++ b/packages/edit-site/src/components/save-button/index.js
@@ -39,21 +39,24 @@ export default function SaveButton( {
 	const disabled = isSaving || ! activateSaveEnabled;
 
 	const getLabel = () => {
+		if ( isPreviewingTheme() ) {
+			if ( isSaving ) {
+				return __( 'Activating' );
+			} else if ( disabled ) {
+				return __( 'Saved' );
+			} else if ( isDirty ) {
+				return __( 'Activate & Save' );
+			}
+			return __( 'Activate' );
+		}
+
 		if ( isSaving ) {
 			return __( 'Saving' );
-		}
-		if ( disabled ) {
+		} else if ( disabled ) {
 			return __( 'Saved' );
+		} else if ( defaultLabel ) {
+			return defaultLabel;
 		}
-
-		if ( defaultLabel ) return defaultLabel;
-
-		if ( isPreviewingTheme() && isDirty ) {
-			return __( 'Activate & Save' );
-		} else if ( isPreviewingTheme() ) {
-			return __( 'Activate' );
-		}
-
 		return __( 'Save' );
 	};
 	const label = getLabel();