diff --git a/src/components/operations/operation-details/ko/runtime/authorization.html b/src/components/operations/operation-details/ko/runtime/authorization.html
index 1b8f6be1a..06e060a6b 100644
--- a/src/components/operations/operation-details/ko/runtime/authorization.html
+++ b/src/components/operations/operation-details/ko/runtime/authorization.html
@@ -17,7 +17,7 @@ <h3 class="pt-0">Authorization
         <label for="authServer" class="text-monospace form-label"
             data-bind="text: $component.authorizationServer().displayName"></label>
     </div>
-    <div class="col-6">
+    <div class="col-7">
         <div class="form-group">
             <select id="authServer" class="form-control"
                 data-bind="options: $component.authorizationServer().grantTypes, value: $component.selectedGrantType, optionsCaption: 'No auth'">
@@ -30,7 +30,7 @@ <h3 class="pt-0">Authorization
     <div class="col-4">
         <label for="username" class="text-monospace form-label">Username</label>
     </div>
-    <div class="col-6">
+    <div class="col-7">
         <div class="form-group">
             <input type="text" id="username" class="form-control" data-bind="textInput: $component.username" />
         </div>
@@ -40,7 +40,7 @@ <h3 class="pt-0">Authorization
     <div class="col-4">
         <label for="password" class="text-monospace form-label">Password</label>
     </div>
-    <div class="col-6">
+    <div class="col-7">
         <div class="form-group">
             <input type="password" id="password" class="form-control" data-bind="textInput: $component.password" />
             <span class="invalid-feedback" data-bind="text: $component.authorizationError"></span>
@@ -50,7 +50,7 @@ <h3 class="pt-0">Authorization
 <div class="row flex flex-row">
     <div class="col-4">
     </div>
-    <div class="col-6">
+    <div class="col-7">
         <div class="form-group">
             <button class="button button-primary"
                 data-bind="click: $component.authenticateOAuthWithPassword">Authorize</button>
@@ -69,7 +69,7 @@ <h3 class="pt-0">Authorization
             Subscription key
         </label>
     </div>
-    <div class="col-6">
+    <div class="col-7">
         <div class="form-group">
             <!-- ko if: $component.products() && $component.products().length > 0 -->
             <select id="subscriptionKey" class="form-control" data-bind="value: $component.selectedSubscriptionKey">
diff --git a/src/components/operations/operation-details/ko/runtime/operation-console.html b/src/components/operations/operation-details/ko/runtime/operation-console.html
index ea0d7189e..501a5a98b 100644
--- a/src/components/operations/operation-details/ko/runtime/operation-console.html
+++ b/src/components/operations/operation-details/ko/runtime/operation-console.html
@@ -46,7 +46,7 @@ <h3>Host</h3>
                         Hostname
                     </label>
                 </div>
-                <div class="col-6">
+                <div class="col-7">
                     <div class="form-group">
                         <!-- ko if: $component.hostnameSelectionEnabled -->
                         <select id="hostname" class="form-control" data-bind="value: $component.selectedHostname">
@@ -72,7 +72,7 @@ <h3>Host</h3>
                         Wildcard segment
                     </label>
                 </div>
-                <div class="col-6">
+                <div class="col-7">
                     <div class="form-group">
                         <input id="wildcardSegment" type="text" autocomplete="off" class="form-control form-control-sm"
                             placeholder="name" spellcheck="false"
@@ -105,7 +105,7 @@ <h3>Parameters
                         <label class="text-monospace form-label" data-bind="text: parameter.name">
                         </label>
                     </div>
-                    <div class="col-6">
+                    <div class="col-7">
                         <div class="form-group">
                             <!-- ko if: parameter.options.length > 0 -->
                             <select class="form-control" aria-label="Parameter value"
diff --git a/src/constants.ts b/src/constants.ts
index 975789208..f1a21c4cf 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -273,6 +273,12 @@ export enum GrantTypes {
      */
     authorizationCode = "authorization_code",
 
+    /**
+     * Proof Key for Code Exchange (abbreviated PKCE) is an extension to the authorization code
+     * flow to prevent CSRF and authorization code injection attacks.
+     */
+    authorizationCodeWithPkce = "authorization_code (PKCE)",
+
     /**
      * The Client Credentials grant type is used by clients to obtain an access token outside of
      * the context of a user.
diff --git a/src/contracts/oauthTokenResponse.ts b/src/contracts/oauthTokenResponse.ts
new file mode 100644
index 000000000..3bc4668b8
--- /dev/null
+++ b/src/contracts/oauthTokenResponse.ts
@@ -0,0 +1,26 @@
+export interface OAuthTokenResponse {
+    /**
+     * Access token.
+     */
+    access_token: string;
+
+    /**
+     * Type of the access token, e.g. `Bearer`.
+     */
+    token_type: string;
+
+    /**
+     * Expiration date and time, e.g. `1663205603`
+     */
+    expires_on: string;
+
+    /**
+     * Base64-encoded ID token.
+     */
+    id_token: string;
+
+    /**
+     * Refresh token.
+     */
+    refresh_token: string;
+}
\ No newline at end of file
diff --git a/src/models/authorizationServer.ts b/src/models/authorizationServer.ts
index 67f216fb7..5a7d153bb 100644
--- a/src/models/authorizationServer.ts
+++ b/src/models/authorizationServer.ts
@@ -37,6 +37,9 @@ export class AuthorizationServer {
                 case "authorizationCode":
                     convertedResult = "authorization_code";
                     break;
+                case "authorizationCodeWithPkce":
+                    convertedResult = "authorization_code (PKCE)";
+                    break;
                 case "implicit":
                     convertedResult = "implicit";
                     break;
diff --git a/src/models/knownMimeTypes.ts b/src/models/knownMimeTypes.ts
index e0e691611..45eefdfdd 100644
--- a/src/models/knownMimeTypes.ts
+++ b/src/models/knownMimeTypes.ts
@@ -1,5 +1,6 @@
 export enum KnownMimeTypes {
     FormData = "multipart/form-data",
     Json = "application/json",
-    Xml = "text/xml"
+    Xml = "text/xml",
+    UrlEncodedForm = "application/x-www-form-urlencoded"
 }
\ No newline at end of file
diff --git a/src/services/oauthService.ts b/src/services/oauthService.ts
index 8efb20d36..11f0d57f6 100644
--- a/src/services/oauthService.ts
+++ b/src/services/oauthService.ts
@@ -9,6 +9,7 @@ import { Utils } from "../utils";
 import { GrantTypes } from "./../constants";
 import { UnauthorizedError } from "./../errors/unauthorizedError";
 import { BackendService } from "./backendService";
+import { OAuthTokenResponse } from "../contracts/oauthTokenResponse";
 
 
 export class OAuthService {
@@ -19,6 +20,25 @@ export class OAuthService {
         private readonly logger: Logger
     ) { }
 
+    private async generateCodeChallenge(codeVerifier: string): Promise<string> {
+        const digest = await crypto.subtle.digest("SHA-256",
+            new TextEncoder().encode(codeVerifier));
+
+        return btoa(String.fromCharCode(...new Uint8Array(digest)))
+            .replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_")
+    }
+
+    private generateRandomString(length: number): string {
+        let text = "";
+        const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+        for (let i = 0; i < length; i++) {
+            text += possible.charAt(Math.floor(Math.random() * possible.length));
+        }
+
+        return text;
+    }
+
     public async getAuthServer(authorizationServerId: string, openidProviderId: string): Promise<AuthorizationServer> {
         try {
             if (authorizationServerId) {
@@ -58,6 +78,11 @@ export class OAuthService {
                 accessToken = await this.authenticateCode(backendUrl, authorizationServer);
                 break;
 
+            case GrantTypes.authorizationCodeWithPkce:
+                this.logger.trackEvent("TestConsoleOAuth", { grantType: GrantTypes.authorizationCodeWithPkce });
+                accessToken = await this.authenticateCodeWithPkce(backendUrl, authorizationServer);
+                break;
+
             case GrantTypes.clientCredentials:
                 this.logger.trackEvent("TestConsoleOAuth", { grantType: GrantTypes.clientCredentials });
                 accessToken = await this.authenticateClientCredentials(backendUrl, authorizationServer, apiName);
@@ -149,8 +174,9 @@ export class OAuthService {
             try {
                 window.open(oauthClient.code.getUri(), "_blank", "width=400,height=500");
 
-                const receiveMessage = async (event: MessageEvent) => {
+                const receiveMessage = async (event: MessageEvent): Promise<void> => {
                     if (!event.data["accessToken"]) {
+                        alert("Unable to authenticate due to internal error.");
                         return;
                     }
 
@@ -167,6 +193,74 @@ export class OAuthService {
         });
     }
 
+    public async authenticateCodeWithPkce(backendUrl: string, authorizationServer: AuthorizationServer): Promise<string> {
+        const redirectUri = `${backendUrl}/signin-oauth/code-pkce/callback/${authorizationServer.name}`;
+        const codeVerifier = this.generateRandomString(64);
+        const challengeMethod = crypto.subtle ? "S256" : "plain"
+
+        const codeChallenge = challengeMethod === "S256"
+            ? await this.generateCodeChallenge(codeVerifier)
+            : codeVerifier
+
+        sessionStorage.setItem("code_verifier", codeVerifier);
+
+        const args = new URLSearchParams({
+            response_type: "code",
+            client_id: authorizationServer.clientId,
+            code_challenge_method: challengeMethod,
+            code_challenge: codeChallenge,
+            redirect_uri: redirectUri,
+            scope: authorizationServer.scopes.join(" ")
+        });
+
+        return new Promise((resolve, reject) => {
+            try {
+                window.open(authorizationServer.authorizationEndpoint + "/?" + args, "_blank", "width=400,height=500");
+
+                const receiveMessage = async (event: MessageEvent): Promise<void> => {
+                    const authorizationCode = event.data["code"];
+
+                    if (!authorizationCode) {
+                        alert("Unable to authenticate due to internal error.");
+                        return;
+                    }
+
+                    const body = new URLSearchParams({
+                        client_id: authorizationServer.clientId,
+                        code_verifier: sessionStorage.getItem("code_verifier"),
+                        grant_type: GrantTypes.authorizationCode,
+                        redirect_uri: redirectUri,
+                        code: authorizationCode
+                    });
+
+                    const response = await this.httpClient.send<OAuthTokenResponse>({
+                        url: authorizationServer.tokenEndpoint,
+                        method: HttpMethod.post,
+                        headers: [{ name: KnownHttpHeaders.ContentType, value: KnownMimeTypes.UrlEncodedForm }],
+                        body: body.toString()
+                    });
+
+                    if (response.statusCode === 400) {
+                        const error = response.toText();
+                        alert(error);
+                        return;
+                    }
+
+                    const tokenResponse = response.toObject();
+                    const accessToken = tokenResponse.access_token;
+                    const accessTokenType = tokenResponse.token_type;
+
+                    resolve(`${Utils.toTitleCase(accessTokenType)} ${accessToken}`);
+                };
+
+                window.addEventListener("message", receiveMessage, false);
+            }
+            catch (error) {
+                reject(error);
+            }
+        });
+    }
+
     /**
      * Acquires access token using "client credentials" grant flow.
      * @param backendUrl {string} Portal backend URL.