diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index 62e89ad03fa28..5874c000b135a 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -1495,6 +1495,15 @@ rc-old select,
 				border-bottom: none;
 			}
 
+			& .add-token {
+				display: flex;
+
+				& .rc-select {
+					width: 40%;
+					margin: 0 0 0 10px;
+				}
+			}
+
 			&:first-child {
 				padding-top: 0;
 			}
@@ -4978,6 +4987,15 @@ rc-old select,
 			display: none;
 		}
 	}
+
+	.add-token {
+		display: block !important;
+
+		& .rc-select {
+			width: auto !important;
+			margin: 10px 0 !important;
+		}
+	}
 }
 
 @media (width <= 500px) {
diff --git a/imports/personal-access-tokens/client/personalAccessTokens.html b/imports/personal-access-tokens/client/personalAccessTokens.html
index b0e790ecd1c54..9234ee6b4f53d 100644
--- a/imports/personal-access-tokens/client/personalAccessTokens.html
+++ b/imports/personal-access-tokens/client/personalAccessTokens.html
@@ -8,7 +8,7 @@
 				<div class="section-content border-component-color">
 					<div class="input-line double-col">
 						<label for="tokenName" class="setting-label">{{_ "API_Personal_Access_Tokens_To_REST_API"}}</label>
-						<div style="display: flex;">
+						<div class="add-token">
 							<div class="setting-field" style="flex-grow: 1;">
 								<input type="text" class="rc-input__element js-search" name="tokenName" id="tokenName"
 									placeholder={{_ "API_Add_Personal_Access_Token"}} autocomplete="off" />
@@ -20,8 +20,8 @@
 								</select>
 								{{> icon block="rc-select__arrow" icon="arrow-down"}}
 							</div>
+							<button name="add" class="rc-button rc-button--primary setting-action save-token">{{_ "Add"}}</button>
 						</div>
-						<button name="add" class="rc-button rc-button--primary setting-action save-token">{{_ "Add"}}</button>
 					</div>
 				</div>
 			</form>