diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index 146754db..07538ecb 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -18,8 +18,10 @@
           :placeholder="$t('polls.option')"
           :maxlength="maxLength"
           @change="updatePollToParent"
-          @keydown.enter.stop.prevent="nextOption(index)"
-        >
+          @keydown.enter.stop.prevent="
+            $event.isComposing || $event.keyCode === 229 || nextOption(index)
+          "
+        />
       </div>
       <button
         v-if="options.length > 2"
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index bf859113..06a16d9e 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -167,7 +167,11 @@
             :disabled="posting && !optimisticPosting"
             class="form-post-body"
             :class="{ 'scrollable-form': !!maxHeight }"
-            @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
+            @keydown.exact.enter="
+              $event.isComposing ||
+                $event.keyCode === 229 ||
+                (submitOnEnter && postStatus($event, newStatus))
+            "
             @keydown.meta.enter="postStatus($event, newStatus)"
             @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
             @input="resize"
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index b7bfc1f3..e893ca02 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -11,7 +11,9 @@
         v-model="searchTerm"
         class="search-input"
         :placeholder="$t('nav.search')"
-        @keyup.enter="newQuery(searchTerm)"
+        @keydown.enter="
+          $event.isComposing || $event.keyCode === 229 || newQuery(searchTerm)
+        "
       >
       <button
         class="btn button-default search-button"
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 831c47ae..ab7d2972 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -24,7 +24,9 @@
         class="search-bar-input"
         :placeholder="$t('nav.search')"
         type="text"
-        @keyup.enter="find(searchTerm)"
+        @keydown.enter="
+          $event.isComposing || $event.keyCode === 229 || find(searchTerm)
+        "
       >
       <button
         class="button-default search-button"