diff --git a/react-common/components/controls/EditorToggle.tsx b/react-common/components/controls/EditorToggle.tsx
index 44422de3242..1b40f580263 100644
--- a/react-common/components/controls/EditorToggle.tsx
+++ b/react-common/components/controls/EditorToggle.tsx
@@ -125,7 +125,11 @@ const EditorToggleAccessibleMenu = (props: EditorToggleProps) => {
         next.push({...current});
 
         // The selected item will always be a top-level option, not in a dropdown
-        if (selected === index) next[next.length - 1].selected = true;
+        if (selected === index) {
+            next[next.length - 1].selected = true;
+        } else {
+            next[next.length - 1].selected = false;
+        }
 
         if (isDropdownItem(current)) {
             next.push(...current.items.filter(i => i.focusable))
diff --git a/react-common/components/controls/FocusList.tsx b/react-common/components/controls/FocusList.tsx
index 102dbd399d9..8e316a2f7fe 100644
--- a/react-common/components/controls/FocusList.tsx
+++ b/react-common/components/controls/FocusList.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ContainerProps } from "../util";
+import { ContainerProps, findNextFocusableElement } from "../util";
 
 export interface FocusListProps extends ContainerProps {
     role: string;
@@ -62,37 +62,6 @@ export const FocusList = (props: FocusListProps) => {
             && getComputedStyle(e).display !== "none";
     }
 
-    const firstFocusableElement = () => {
-        return focusableElements.find(e => isFocusable(e))
-    }
-
-    const lastFocusableElement = () => {
-        for (let i = 0; i < focusableElements.length; i++) {
-            if (isFocusable(focusableElements[focusableElements.length - 1 - i])) {
-                return focusableElements[focusableElements.length - 1 - i];
-            }
-        }
-
-        return focusableElements[0];
-    }
-
-    const nextFocusableElement = (index: number, forwards: boolean) => {
-        let current: HTMLElement
-        for (let i = 1; i < focusableElements.length; i++) {
-            if (forwards) {
-                current = focusableElements[(index + i) % focusableElements.length];
-            }
-            else {
-                current = focusableElements[(index + focusableElements.length - i) % focusableElements.length];
-            }
-
-            if (isFocusable(current)) {
-                return current;
-            }
-        }
-        return focusableElements[0];
-    }
-
     const onKeyDown = (e: React.KeyboardEvent<HTMLElement>) => {
         if  (!focusableElements?.length) return;
 
@@ -120,31 +89,31 @@ export const FocusList = (props: FocusListProps) => {
         }
         else if (e.key === (useUpAndDownArrowKeys ? "ArrowDown" : "ArrowRight")) {
             if (index === focusableElements.length - 1 || target === focusList) {
-                focus(firstFocusableElement());
+                focus(findNextFocusableElement(focusableElements, index, 0, true, isFocusable));
             }
             else {
-                focus(nextFocusableElement(index, true));
+                focus(findNextFocusableElement(focusableElements, index, index + 1, true, isFocusable));
             }
             e.preventDefault();
             e.stopPropagation();
         }
         else if (e.key === (useUpAndDownArrowKeys ? "ArrowUp" : "ArrowLeft")) {
             if (index === 0 || target === focusList) {
-                focus(lastFocusableElement());
+                focus(findNextFocusableElement(focusableElements, index, focusableElements.length - 1, false, isFocusable));
             }
             else {
-                focus(nextFocusableElement(index, false));
+                focus(findNextFocusableElement(focusableElements, index, index - 1, false, isFocusable));
             }
             e.preventDefault();
             e.stopPropagation();
         }
         else if (e.key === "Home") {
-            focus(firstFocusableElement());
+            focus(findNextFocusableElement(focusableElements, index, 0, true, isFocusable));
             e.preventDefault();
             e.stopPropagation();
         }
         else if (e.key === "End") {
-            focus(lastFocusableElement());
+            focus(findNextFocusableElement(focusableElements, index, focusableElements.length - 1, true, isFocusable));
             e.preventDefault();
             e.stopPropagation();
         }
diff --git a/react-common/components/controls/FocusTrap.tsx b/react-common/components/controls/FocusTrap.tsx
index 17ff6c343ca..5c214a44fc8 100644
--- a/react-common/components/controls/FocusTrap.tsx
+++ b/react-common/components/controls/FocusTrap.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { classList, nodeListToArray } from "../util";
+import { classList, nodeListToArray, findNextFocusableElement } from "../util";
 
 export interface FocusTrapProps extends React.PropsWithChildren<{}> {
     onEscape: () => void;
@@ -58,24 +58,24 @@ export const FocusTrap = (props: FocusTrapProps) => {
 
             if (forward) {
                 if (goToEnd) {
-                    focusable[focusable.length - 1].focus();
+                    findNextFocusableElement(focusable, index, focusable.length - 1, forward).focus();
                 }
                 else if (index === focusable.length - 1) {
-                    focusable[0].focus();
+                    findNextFocusableElement(focusable, index, 0, forward).focus();
                 }
                 else {
-                    focusable[index + 1].focus();
+                    findNextFocusableElement(focusable, index, index + 1, forward).focus();
                 }
             }
             else {
                 if (goToEnd) {
-                    focusable[0].focus();
+                    findNextFocusableElement(focusable, index, 0, forward).focus();
                 }
                 else if (index === 0) {
-                    focusable[focusable.length - 1].focus();
+                    findNextFocusableElement(focusable, index, focusable.length - 1, forward).focus();
                 }
                 else {
-                    focusable[Math.max(index - 1, 0)].focus();
+                    findNextFocusableElement(focusable, index, Math.max(index - 1, 0), forward).focus();
                 }
             }
 
diff --git a/react-common/components/share/ShareInfo.tsx b/react-common/components/share/ShareInfo.tsx
index 159a91cfd9d..a055e7f0cef 100644
--- a/react-common/components/share/ShareInfo.tsx
+++ b/react-common/components/share/ShareInfo.tsx
@@ -32,6 +32,7 @@ export interface ShareInfoProps {
     onClose: () => void;
 }
 
+
 export const ShareInfo = (props: ShareInfoProps) => {
     const {
         projectName,
@@ -323,7 +324,7 @@ export const ShareInfo = (props: ShareInfoProps) => {
             {showSimulator && shareState !== "gifrecord" &&
                 <div className="project-share-thumbnail">
                     {thumbnailUri
-                        ? <img src={thumbnailUri} />
+                        ? <img src={thumbnailUri} alt={lf("Preview of your code running on the simulator")} aria-label={lf("Simulator preview")}/>
                         : <div className="project-thumbnail-placeholder">
                              <div className="common-spinner" />
                         </div>
@@ -406,6 +407,7 @@ export const ShareInfo = (props: ShareInfoProps) => {
                             <div className="common-input-attached-button">
                                 <Input
                                     ariaDescribedBy="share-input-title"
+                                    ariaLabel={lf("Your shareable project link")}
                                     handleInputRef={handleInputRef}
                                     initialValue={shareData.url}
                                     readOnly={true}
@@ -462,7 +464,7 @@ export const ShareInfo = (props: ShareInfoProps) => {
                                     className="menu-button project-qrcode"
                                     buttonRef={handleQRCodeButtonRef}
                                     title={lf("Show QR Code")}
-                                    label={<img className="qrcode-image" src={shareData?.qr} />}
+                                    label={<img className="qrcode-image" src={shareData?.qr} alt={lf("QR code to access your project")} aria-label={lf("Project share link QR code")}/>}
                                     onClick={handleQRCodeClick}
                                 />
                             </div>
@@ -475,7 +477,8 @@ export const ShareInfo = (props: ShareInfoProps) => {
                             selected={embedOptions.findIndex(i => i.name === embedState)} />
                         <Textarea readOnly={true}
                             rows={5}
-                            initialValue={shareData?.embed[embedState]} />
+                            initialValue={shareData?.embed[embedState]}
+                            ariaLabel={lf("Embed code textarea")} />
                     </div>}
                     {kioskState &&
                         <div>
@@ -511,9 +514,9 @@ export const ShareInfo = (props: ShareInfoProps) => {
             </div>
 
             {showQRCode &&
-                <Modal title={lf("QR Code")} onClose={handleQRCodeModalClose}>
+                <Modal title={lf("QR Code")} onClose={handleQRCodeModalClose} ariaLabel={lf("QR Code modal")} >
                     <div className="qrcode-modal-body">
-                        <img className="qrcode-image" src={shareData?.qr} />
+                        <img className="qrcode-image" src={shareData?.qr} alt={lf("QR code to access your project")} aria-label={lf("Project share link QR code enlarged")} />
                     </div>
                 </Modal>
             }
diff --git a/react-common/components/util.tsx b/react-common/components/util.tsx
index 86e3d803366..229d27a8c0c 100644
--- a/react-common/components/util.tsx
+++ b/react-common/components/util.tsx
@@ -91,4 +91,25 @@ export function screenToSVGCoord(ref: SVGSVGElement, coord: ClientCoordinates) {
     screenCoord.x = coord.clientX;
     screenCoord.y = coord.clientY;
     return screenCoord.matrixTransform(ref.getScreenCTM().inverse());
+}
+
+export function findNextFocusableElement(elements: HTMLElement[], focusedIndex: number, index: number, forward: boolean, isFocusable?: (e: HTMLElement) => boolean): HTMLElement {
+    const increment = forward ? 1 : -1;
+    const element = elements[index];
+    // in this case, there are no focusable elements
+    if (focusedIndex === index) {
+        return element;
+    }
+    if (isFocusable ? isFocusable(element) : getComputedStyle(element).display !== "none") {
+        return element;
+    } else {
+        if (index + increment >= elements.length) {
+            index = 0;
+        } else if (index + increment < 0) {
+            index = elements.length - 1;
+        } else {
+            index += increment;
+        }
+    }
+    return findNextFocusableElement(elements, focusedIndex, index, forward);
 }
\ No newline at end of file
diff --git a/react-common/styles/controls/Modal.less b/react-common/styles/controls/Modal.less
index feb1bc42fd2..f06886d5a19 100644
--- a/react-common/styles/controls/Modal.less
+++ b/react-common/styles/controls/Modal.less
@@ -20,8 +20,10 @@
 .common-modal {
     width: 50%;
     max-width: 40rem;
+    max-height: 100%;
     border-radius: .285rem;
-    overflow: hidden;
+    overflow-x: hidden;
+    overflow-y: auto;
 }
 
 .wide > .common-modal {
diff --git a/react-common/styles/react-common-variables.less b/react-common/styles/react-common-variables.less
index 4e4d49f62df..c2eaced76e4 100644
--- a/react-common/styles/react-common-variables.less
+++ b/react-common/styles/react-common-variables.less
@@ -105,7 +105,7 @@
  *              EditorToggle                        *
  ****************************************************/
 
-@editorToggleBackgroundColor: rgba(52,73,94,.4);
+@editorToggleBackgroundColor: rgba(52,73,94,.8);
 @editorToggleBorderColor: rgba(52,73,94,.2);
 @editorToggleBorderWidth: 3px;
 
diff --git a/react-common/styles/share/share.less b/react-common/styles/share/share.less
index 2f280d749b7..45138117bf9 100644
--- a/react-common/styles/share/share.less
+++ b/react-common/styles/share/share.less
@@ -150,6 +150,7 @@
     margin-top: 1rem;
     position: relative;
     margin-bottom: 2rem;
+    justify-content: space-between;
 }
 
 .project-share-social {
@@ -312,6 +313,12 @@
     .gif-recorder-content .thumbnail-controls {
         padding: 0 2rem;
     }
+
+    .common-button.square-button.embed.gray.mobile-portrait-hidden {
+        // important is need for color to override semantic ui's use of important
+        color: #323130 !important;
+        background: #e0e1e2;
+    }
 }
 
 @media @mobileAndBelow {