diff --git a/gui/src/components/find/FindWidget.tsx b/gui/src/components/find/FindWidget.tsx
index 53376b9e6f0..9617380e36a 100644
--- a/gui/src/components/find/FindWidget.tsx
+++ b/gui/src/components/find/FindWidget.tsx
@@ -279,6 +279,8 @@ export const useFindWidget = (
       <HeaderButton
         inverted={false}
         onClick={() => setOpen(false)}
+        aria-label="Close find widget"
+        title="Close find widget"
         className="focus:ring"
       >
         <XMarkIcon className="h-4 w-4" />
diff --git a/gui/src/components/gui/HeaderButtonWithToolTip.tsx b/gui/src/components/gui/HeaderButtonWithToolTip.tsx
index 602581e4362..494e35a3360 100644
--- a/gui/src/components/gui/HeaderButtonWithToolTip.tsx
+++ b/gui/src/components/gui/HeaderButtonWithToolTip.tsx
@@ -37,6 +37,8 @@ const HeaderButtonWithToolTip = React.forwardRef<
         disabled={props.disabled}
         onClick={props.onClick}
         onKeyDown={props.onKeyDown}
+        aria-label={props.text}
+        title={props.text}
         className={props.className}
         style={props.style}
         ref={ref}
diff --git a/gui/src/components/mainInput/InputToolbar.tsx b/gui/src/components/mainInput/InputToolbar.tsx
index 99a940b78b6..e10277bde09 100644
--- a/gui/src/components/mainInput/InputToolbar.tsx
+++ b/gui/src/components/mainInput/InputToolbar.tsx
@@ -226,6 +226,8 @@ function InputToolbar(props: InputToolbarProps) {
               variant={props.isMainInput ? "primary" : "secondary"}
               size="sm"
               data-testid="submit-input-button"
+              aria-label="Send message"
+              title="Send message"
               onClick={async (e) => {
                 if (props.onEnter) {
                   props.onEnter({
diff --git a/gui/src/components/mainInput/TipTapEditor/utils/editorConfig.ts b/gui/src/components/mainInput/TipTapEditor/utils/editorConfig.ts
index 7076fa60a6a..54e863b8dfc 100644
--- a/gui/src/components/mainInput/TipTapEditor/utils/editorConfig.ts
+++ b/gui/src/components/mainInput/TipTapEditor/utils/editorConfig.ts
@@ -386,6 +386,7 @@ export function createEditorConfig(options: {
         "data-testid": props.isMainInput
           ? "editor-input-main"
           : `editor-input-${props.inputId}`,
+        ...(props.isMainInput ? { "aria-label": "Chat message input" } : {}),
         class: "ProseMirror outline-none overflow-hidden",
         style: `font-size: ${getFontSize()}px;`,
       },
diff --git a/gui/src/components/modelSelection/ModelSelect.tsx b/gui/src/components/modelSelection/ModelSelect.tsx
index b4159314f2d..0ea75491425 100644
--- a/gui/src/components/modelSelection/ModelSelect.tsx
+++ b/gui/src/components/modelSelection/ModelSelect.tsx
@@ -109,6 +109,8 @@ function ModelOption({
           size="sm"
           className="text-description-muted hover:enabled:text-foreground my-0 h-4 w-4 p-0 opacity-0 transition-opacity group-hover:opacity-100"
           onClick={handleConfigureClick}
+          aria-label={`Configure ${option.title}`}
+          title={`Configure ${option.title}`}
         >
           <Cog6ToothIcon className="h-3.5 w-3.5" />
         </Button>
@@ -271,6 +273,8 @@ function ModelSelect() {
                 variant="ghost"
                 size="sm"
                 className="my-0 h-5 w-5 p-0"
+                aria-label="Configure models"
+                title="Configure models"
               >
                 <Cog6ToothIcon className="text-description h-3.5 w-3.5" />
               </Button>