diff --git a/src/Form/SearchApiPageBlockForm.php b/src/Form/SearchApiPageBlockForm.php
index 0de9188..f443ca8 100644
--- a/src/Form/SearchApiPageBlockForm.php
+++ b/src/Form/SearchApiPageBlockForm.php
@@ -71,6 +71,8 @@ class SearchApiPageBlockForm extends FormBase {
     /* @var $search_api_page \Drupal\search_api_page\SearchApiPageInterface */
     $search_api_page = SearchApiPage::load($args['search_api_page']);
 
+    $langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
+
     $form['search_api_page'] = array(
       '#type' => 'value',
       '#value' => $search_api_page->id(),
@@ -86,21 +88,21 @@ class SearchApiPageBlockForm extends FormBase {
 
     $form['keys'] = array(
       '#type' => 'search',
-      '#title' => $this->t('Search'),
+      '#title' => $this->t('Search', array(), array('langcode' => $langcode)),
       '#title_display' => 'invisible',
       '#size' => 15,
       '#default_value' => $default_value,
-      '#attributes' => array('title' => $this->t('Enter the terms you wish to search for.')),
+      '#attributes' => array('title' => $this->t('Enter the terms you wish to search for.', array(), array('langcode' => $langcode)),
     );
 
     $form['actions'] = array('#type' => 'actions');
     $form['actions']['submit'] = array(
       '#type' => 'submit',
-      '#value' => $this->t('Search'),
+      '#value' => $this->t('Search', array(), array('langcode' => $langcode)),
     );
 
     if (!$search_api_page->getCleanUrl()) {
-      $route = 'search_api_page.' . $this->languageManager->getCurrentLanguage()->getId() . '.' . $search_api_page->id();
+      $route = 'search_api_page.' . $langcode . '.' . $search_api_page->id();
       $form['#action'] = $this->getUrlGenerator()->generateFromRoute($route);
       $form['#method'] = 'get';
       $form['actions']['submit']['#name'] = '';
@@ -108,6 +110,7 @@ class SearchApiPageBlockForm extends FormBase {
 
     // Dependency on search api config entity.
     $this->renderer->addCacheableDependency($form, $search_api_page->getConfigDependencyName());
+    $this->renderer->addCacheableDependency($form, $langcode);
 
     return $form;
   }
@@ -118,8 +121,9 @@ class SearchApiPageBlockForm extends FormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     // This form submits to the search page, so processing happens there.
     $keys = $form_state->getValue('keys');
+    $langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
     /* @var $searchApiPage \Drupal\search_api_page\SearchApiPageInterface */
-    $form_state->setRedirectUrl(Url::fromRoute('search_api_page.' . $this->languageManager->getCurrentLanguage()->getId() . '.' . $form_state->getValue('search_api_page'), array('keys' => $keys)));
+    $form_state->setRedirectUrl(Url::fromRoute('search_api_page.' . $langcode . '.' . $form_state->getValue('search_api_page'), array('keys' => $keys)));
   }
 
 }