diff --git a/__tests__/shared/components/TopcoderHeader/__snapshots__/index.jsx.snap b/__tests__/shared/components/TopcoderHeader/__snapshots__/index.jsx.snap
index ac1262d3f0..ab20ec3019 100644
--- a/__tests__/shared/components/TopcoderHeader/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/TopcoderHeader/__snapshots__/index.jsx.snap
@@ -652,22 +652,29 @@ exports[`Render with specified profile 1`] = `
       >
         <div
           className="src-shared-components-TopcoderHeader-___style__user-menu-handle___r6kbg"
+          role="button"
           style={
             Object {
               "color": "#555555",
             }
           }
+          tabIndex={0}
         />
-        <div
-          className="src-shared-components-TopcoderHeader-___style__avatar___3BqbY"
+        <span
+          role="link"
+          tabIndex={0}
         >
-          <ThemedAvatar
-            composeAdhocTheme="deeply"
-            composeContextTheme="softly"
-            mapThemrProps={[Function]}
-            themePriority="adhoc-context-default"
-          />
-        </div>
+          <div
+            className="src-shared-components-TopcoderHeader-___style__avatar___3BqbY"
+          >
+            <ThemedAvatar
+              composeAdhocTheme="deeply"
+              composeContextTheme="softly"
+              mapThemrProps={[Function]}
+              themePriority="adhoc-context-default"
+            />
+          </div>
+        </span>
       </div>
       <div
         className="opened src-shared-components-TopcoderHeader-___style__search-icon___3w5nA"
diff --git a/src/shared/components/TopcoderHeader/index.jsx b/src/shared/components/TopcoderHeader/index.jsx
index 5557d50ea4..e8363897d0 100644
--- a/src/shared/components/TopcoderHeader/index.jsx
+++ b/src/shared/components/TopcoderHeader/index.jsx
@@ -320,10 +320,12 @@ export default class TopcoderHeader extends React.Component {
               color: getRatingColor(_.get(normalizedProfile, 'maxRating.rating', 0)),
             }}
             styleName="user-menu-handle"
+            tabIndex={0}
+            role="button"
           >
             {normalizedProfile.handle}
           </div>
-          {userAvatar}
+          <span role="link" tabIndex={0}>{userAvatar}</span>
         </div>
       );
     } else {