diff --git a/SafeExamBrowser.I18n.Contracts/TextKey.cs b/SafeExamBrowser.I18n.Contracts/TextKey.cs
index b45a251b..da2ce5a7 100644
--- a/SafeExamBrowser.I18n.Contracts/TextKey.cs
+++ b/SafeExamBrowser.I18n.Contracts/TextKey.cs
@@ -26,6 +26,7 @@ namespace SafeExamBrowser.I18n.Contracts
 		Browser_PrintNotAllowed,
 		Browser_Tooltip,
 		BrowserWindow_BackwardButton,
+		BrowserWindow_CloseButton,
 		BrowserWindow_DeveloperConsoleMenuItem,
 		BrowserWindow_Downloading,
 		BrowserWindow_DownloadCancelled,
@@ -37,6 +38,9 @@ namespace SafeExamBrowser.I18n.Contracts
 		BrowserWindow_HomeButton,
 		BrowserWindow_MenuButton,
 		BrowserWindow_ReloadButton,
+		BrowserWindow_SearchNext,
+		BrowserWindow_SearchPrevious,
+		BrowserWindow_SearchTextBox,
 		BrowserWindow_UrlTextBox,
 		BrowserWindow_ZoomLevelReset,
 		BrowserWindow_ZoomMenuItem,
diff --git a/SafeExamBrowser.I18n/Data/de.xml b/SafeExamBrowser.I18n/Data/de.xml
index 2e56014f..f5449e50 100644
--- a/SafeExamBrowser.I18n/Data/de.xml
+++ b/SafeExamBrowser.I18n/Data/de.xml
@@ -31,7 +31,7 @@
         Drucken ist nicht erlaubt gemäss der aktiven Konfiguration.
     </Entry>
     <Entry key="Browser_Tooltip">
-        Browser Applikation
+        Geöffnete Websites
     </Entry>
     <Entry key="BrowserWindow_DeveloperConsoleMenuItem">
         Entwickler-Konsole
@@ -69,6 +69,9 @@
     <Entry key="BrowserWindow_MenuButton">
         Menü
     </Entry>
+    <Entry key="BrowserWindow_CloseButton">
+        Schliessen
+    </Entry>
     <Entry key="BrowserWindow_UrlTextBox">
         URL eingeben
     </Entry>
@@ -84,6 +87,15 @@
     <Entry key="BrowserWindow_ZoomMenuMinus">
         Zoom verkleinern
     </Entry>
+    <Entry key="BrowserWindow_SearchTextBox">
+        Text eingeben zum Suchen
+    </Entry>
+    <Entry key="BrowserWindow_SearchNext">
+        Nächstes Suchresultat
+    </Entry>
+    <Entry key="BrowserWindow_SearchPrevious">
+        Vorheriges Suchresultat
+    </Entry>
     <Entry key="Build">
         Build
     </Entry>
diff --git a/SafeExamBrowser.I18n/Data/en.xml b/SafeExamBrowser.I18n/Data/en.xml
index c4c35e5d..df82cb90 100644
--- a/SafeExamBrowser.I18n/Data/en.xml
+++ b/SafeExamBrowser.I18n/Data/en.xml
@@ -31,7 +31,7 @@
         Printing is not allowed according to the current configuration.
     </Entry>
     <Entry key="Browser_Tooltip">
-        Browser Application
+        Open Webpages
     </Entry>
     <Entry key="BrowserWindow_DeveloperConsoleMenuItem">
         Developer Console
@@ -69,6 +69,9 @@
     <Entry key="BrowserWindow_MenuButton">
         Menu
     </Entry>
+    <Entry key="BrowserWindow_CloseButton">
+        Close
+    </Entry>
     <Entry key="BrowserWindow_UrlTextBox">
         Enter URL
     </Entry>
@@ -84,6 +87,15 @@
     <Entry key="BrowserWindow_ZoomMenuMinus">
         Decrease Page Zoom
     </Entry>
+    <Entry key="BrowserWindow_SearchTextBox">
+        Enter text to search
+    </Entry>
+    <Entry key="BrowserWindow_SearchNext">
+        Next search result
+    </Entry>
+    <Entry key="BrowserWindow_SearchPrevious">
+        Previous search result
+    </Entry>
     <Entry key="Build">
         Build
     </Entry>
diff --git a/SafeExamBrowser.I18n/Data/fr.xml b/SafeExamBrowser.I18n/Data/fr.xml
index a630e7cd..f0d73ffa 100644
--- a/SafeExamBrowser.I18n/Data/fr.xml
+++ b/SafeExamBrowser.I18n/Data/fr.xml
@@ -34,7 +34,7 @@
         Application du navigateur
     </Entry>
     <Entry key="BrowserWindow_DeveloperConsoleMenuItem">
-        Console de développement
+        Sites web ouverts
     </Entry>
     <Entry key="BrowserWindow_Downloading">
         Chargement…
@@ -69,6 +69,9 @@
     <Entry key="BrowserWindow_MenuButton">
         Menu
     </Entry>
+    <Entry key="BrowserWindow_CloseButton">
+        Fermer
+    </Entry>
     <Entry key="BrowserWindow_UrlTextBox">
         Entrer l'URL
     </Entry>
@@ -84,6 +87,15 @@
     <Entry key="BrowserWindow_ZoomMenuMinus">
         Diminuer zoom
     </Entry>
+    <Entry key="BrowserWindow_SearchTextBox">
+        Saisir du texte pour rechercher
+    </Entry>
+    <Entry key="BrowserWindow_SearchNext">
+        Résultat de recherche prochain
+    </Entry>
+    <Entry key="BrowserWindow_SearchPrevious">
+        Résultat de recherche précédent
+    </Entry>
     <Entry key="Build">
         Build
     </Entry>
diff --git a/SafeExamBrowser.I18n/Data/it.xml b/SafeExamBrowser.I18n/Data/it.xml
index c916323b..20fc8a4e 100644
--- a/SafeExamBrowser.I18n/Data/it.xml
+++ b/SafeExamBrowser.I18n/Data/it.xml
@@ -34,7 +34,7 @@
         Applicazione browser
     </Entry>
     <Entry key="BrowserWindow_DeveloperConsoleMenuItem">
-        Console di sviluppo
+        Siti web aperti
     </Entry>
     <Entry key="BrowserWindow_Downloading">
         Download in corso ...
@@ -69,6 +69,9 @@
     <Entry key="BrowserWindow_MenuButton">
         Menu
     </Entry>
+    <Entry key="BrowserWindow_CloseButton">
+        Chiudere
+    </Entry>
     <Entry key="BrowserWindow_UrlTextBox">
         Inserisci URL
     </Entry>
@@ -84,6 +87,15 @@
     <Entry key="BrowserWindow_ZoomMenuMinus">
         Diminuire zoom
     </Entry>
+    <Entry key="BrowserWindow_SearchTextBox">
+        Immettere il testo da cercare
+    </Entry>
+    <Entry key="BrowserWindow_SearchNext">
+        Risultato della ricerca successiva
+    </Entry>
+    <Entry key="BrowserWindow_SearchPrevious">
+        Risultato della ricerca precedente
+    </Entry>
     <Entry key="Build">
         Build
     </Entry>
diff --git a/SafeExamBrowser.I18n/Data/zh.xml b/SafeExamBrowser.I18n/Data/zh.xml
index 72cec036..f6f972ca 100644
--- a/SafeExamBrowser.I18n/Data/zh.xml
+++ b/SafeExamBrowser.I18n/Data/zh.xml
@@ -34,7 +34,7 @@
         根据当前配置不允许打印。
     </Entry>
     <Entry key="Browser_Tooltip">
-        浏览器应用程序
+        开放网站
     </Entry>
     <Entry key="BrowserWindow_DeveloperConsoleMenuItem">
         开发者控制台
@@ -66,6 +66,9 @@
     <Entry key="BrowserWindow_MenuButton">
         菜单
     </Entry>
+    <Entry key="BrowserWindow_CloseButton">
+        关闭
+    </Entry>
     <Entry key="BrowserWindow_UrlTextBox">
         输入网址
     </Entry>
@@ -81,6 +84,15 @@
     <Entry key="BrowserWindow_ZoomMenuMinus">
         减少页面缩放
     </Entry>
+    <Entry key="BrowserWindow_SearchTextBox">
+        输入文本进行搜索
+    </Entry>
+    <Entry key="BrowserWindow_SearchNext">
+        下一个搜索结果
+    </Entry>
+    <Entry key="BrowserWindow_SearchPrevious">
+        前一个搜索结果
+    </Entry>
     <Entry key="Build">
         生成
     </Entry>
diff --git a/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml
index cd4b266d..a7a7753b 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml
+++ b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml
@@ -80,7 +80,7 @@
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" x:Name="FindMenuText" HorizontalAlignment="Left" Margin="10,0" VerticalAlignment="Center" />
-                                    <Button Grid.Column="1" x:Name="FindMenuButton" Margin="5" Padding="5" Template="{StaticResource BrowserButton}" TabIndex="33">
+                                    <Button Grid.Column="1" x:Name="FindMenuButton" Margin="5" Padding="5" Template="{StaticResource BrowserButton}" TabIndex="33" AutomationProperties.LabeledBy="{Binding ElementName=FindMenuText}">
                                         <fa:ImageAwesome Icon="Search" />
                                     </Button>
                                 </Grid>
diff --git a/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs
index 1ce456c3..8cea8688 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs
@@ -654,6 +654,10 @@ if (typeof __SEB_focusElement === 'undefined') {
 			HomeButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_HomeButton));
 			MenuButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_MenuButton));
 			UrlTextBox.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_UrlTextBox));
+			FindTextBox.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_SearchTextBox));
+			FindPreviousButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_SearchPrevious));
+			FindNextButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_SearchNext));
+			FindbarCloseButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_CloseButton));
 		}
 	}
 }