diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8216a70cbe..070ab1cc05 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2465,7 +2465,7 @@ settings.matrix.homeserver_url = Homeserver URL
 settings.matrix.room_id = Room ID
 settings.matrix.message_type = Message Type
 settings.archive.button = Archive Repo
-settings.archive.header = Archive This Repo
+settings.archive.header = Archive this repo
 settings.archive.text = Archiving the repo will make it entirely read-only. It will be hidden from the dashboard. Nobody (not even you!) will be able to make new commits, or open any issues or pull requests.
 settings.archive.success = The repo was successfully archived.
 settings.archive.error = An error occurred while trying to archive the repo. See the log for more details.
@@ -2473,7 +2473,7 @@ settings.archive.error_ismirror = You cannot archive a mirrored repo.
 settings.archive.branchsettings_unavailable = Branch settings are not available if the repo is archived.
 settings.archive.tagsettings_unavailable = Tag settings are not available if the repo is archived.
 settings.archive.mirrors_unavailable = Mirrors are not available if the repo is archived.
-settings.unarchive.button = Unarchive repo
+settings.unarchive.button = Unarchive Repo
 settings.unarchive.header = Unarchive this repo
 settings.unarchive.text = Unarchiving the repo will restore its ability to receive commits and pushes, as well as new issues and pull-requests.
 settings.unarchive.success = The repo was successfully unarchived.
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index fe2764aa83..2c4a924ba7 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -742,7 +742,13 @@
 					<input type="hidden" name="repo_id" value="{{.Repository.ID}}">
 					<div class="text right actions">
 						<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
-						<button class="ui red button">{{ctx.Locale.Tr "repo.settings.archive.button"}}</button>
+						<button class="ui red button">
+							{{if .Repository.IsArchived}}
+								{{ctx.Locale.Tr "repo.settings.unarchive.button"}}
+							{{else}}
+								{{ctx.Locale.Tr "repo.settings.archive.button"}}
+							{{end}}
+						</button>
 					</div>
 			</form>
 			</div>