diff --git a/src/components/send-message-form/core-send-message-form.html b/src/components/send-message-form/core-send-message-form.html
index 8a7aa0ef1..aea20f503 100644
--- a/src/components/send-message-form/core-send-message-form.html
+++ b/src/components/send-message-form/core-send-message-form.html
@@ -1,7 +1,7 @@
-<form (ngSubmit)="submitForm($event)">
+<form>
     <textarea class="core-send-message-input" [core-auto-focus]="showKeyboard" [placeholder]="placeholder" rows="1" core-auto-rows [(ngModel)]="message" name="message" (onResize)="textareaResized()"></textarea>
     <ion-buttons end>
-        <button ion-button icon-only clear="true" type="submit" [disabled]="!message" [attr.aria-label]="'core.send' | translate">
+        <button ion-button icon-only clear="true" type="submit" [disabled]="!message" [attr.aria-label]="'core.send' | translate" [core-suppress-events] (onClick)="submitForm($event)">
             <ion-icon name="send" color="dark"></ion-icon>
         </button>
     </ion-buttons>
diff --git a/src/components/send-message-form/send-message-form.ts b/src/components/send-message-form/send-message-form.ts
index 15e1e414f..bac82624d 100644
--- a/src/components/send-message-form/send-message-form.ts
+++ b/src/components/send-message-form/send-message-form.ts
@@ -48,20 +48,22 @@ export class CoreSendMessageFormComponent implements OnInit {
 
     /**
      * Form submitted.
-     * @param {any} $event Form submit
+     *
+     * @param {Event} $event Mouse event.
      */
-    submitForm($event: any): void {
-        let value = this.message.trim();
-        $event.target.reset();
+    submitForm($event: Event): void {
+        $event.preventDefault();
+        $event.stopPropagation();
 
-        // Focus again on textarea.
-        $event.target[0].focus();
+        let value = this.message.trim();
 
         if (!value) {
             // Silent error.
             return;
         }
 
+        this.message = ''; // Reset the form.
+
         value = this.textUtils.replaceNewLines(value, '<br>');
         this.onSubmit.emit(value);
     }
diff --git a/src/components/show-password/core-show-password.html b/src/components/show-password/core-show-password.html
index 39ec9513f..ba281d0ed 100644
--- a/src/components/show-password/core-show-password.html
+++ b/src/components/show-password/core-show-password.html
@@ -1,4 +1,4 @@
 <ng-content></ng-content>
-<a ion-button icon-only clear [attr.aria-label]="label | translate" (click)="toggle()" [core-keep-keyboard]="selector" [inButton]="true">
+<a ion-button icon-only clear [attr.aria-label]="label | translate" [core-suppress-events] (onClick)="toggle($event)">
     <core-icon [name]="iconName"></core-icon>
 </a>
diff --git a/src/components/show-password/show-password.ts b/src/components/show-password/show-password.ts
index 3b679df23..7671da8d6 100644
--- a/src/components/show-password/show-password.ts
+++ b/src/components/show-password/show-password.ts
@@ -99,8 +99,13 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
 
     /**
      * Toggle show/hide password.
+     *
+     * @param {Event} event The mouse event.
      */
-    toggle(): void {
+    toggle(event: Event): void {
+        event.preventDefault();
+        event.stopPropagation();
+
         this.shown = !this.shown;
         this.setData();
     }
diff --git a/src/directives/directives.module.ts b/src/directives/directives.module.ts
index 28db74390..90c21ca2e 100644
--- a/src/directives/directives.module.ts
+++ b/src/directives/directives.module.ts
@@ -24,6 +24,7 @@ import { CoreAutoRowsDirective } from './auto-rows';
 import { CoreLongPressDirective } from './long-press';
 import { CoreChartDirective } from './chart';
 import { CoreBackButtonDirective } from './back-button';
+import { CoreSupressEventsDirective } from './supress-events';
 
 @NgModule({
     declarations: [
@@ -37,7 +38,8 @@ import { CoreBackButtonDirective } from './back-button';
         CoreAutoRowsDirective,
         CoreLongPressDirective,
         CoreChartDirective,
-        CoreBackButtonDirective
+        CoreBackButtonDirective,
+        CoreSupressEventsDirective
     ],
     imports: [],
     exports: [
@@ -51,7 +53,8 @@ import { CoreBackButtonDirective } from './back-button';
         CoreAutoRowsDirective,
         CoreLongPressDirective,
         CoreChartDirective,
-        CoreBackButtonDirective
+        CoreBackButtonDirective,
+        CoreSupressEventsDirective
     ]
 })
 export class CoreDirectivesModule {}
diff --git a/src/directives/keep-keyboard.ts b/src/directives/keep-keyboard.ts
index 2cdc41e1f..1c99b27ea 100644
--- a/src/directives/keep-keyboard.ts
+++ b/src/directives/keep-keyboard.ts
@@ -17,6 +17,9 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 
 /**
+ * IMPORTANT: This directive is deprecated because it causes a weird effect (the keyboard closes and opens again).
+ * We recommend using core-suppress-events directive for a better user experience.
+ *
  * Directive to keep the keyboard open when clicking a certain element (usually a button).
  *
  * @description
@@ -39,6 +42,8 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
  *
  * <textarea id="send-message-input"></textarea>
  * <button [core-keep-keyboard]="'#send-message-input'" [inButton]="true">Send</button>
+ *
+ * @deprecated v3.5.2
  */
 @Directive({
     selector: '[core-keep-keyboard]'
diff --git a/src/directives/supress-events.ts b/src/directives/supress-events.ts
new file mode 100644
index 000000000..88bfc891b
--- /dev/null
+++ b/src/directives/supress-events.ts
@@ -0,0 +1,95 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Based on http://roblouie.com/article/198/using-gestures-in-the-ionic-2-beta/
+
+import { Directive, ElementRef, OnInit, Input, Output, EventEmitter } from '@angular/core';
+
+/**
+ * Directive to suppress all events on an element. This is useful to prevent keyboard closing when clicking this element.
+ *
+ * This directive is based on some code posted by johnthackstonanderson in
+ * https://github.com/ionic-team/ionic-plugin-keyboard/issues/81
+ *
+ * @description
+ *
+ * If nothing is supplied or string 'all', then all the default events will be suppressed. This is the recommended usage.
+ *
+ * If you only want to suppress a single event just pass the name of the event. If you want to suppress a set of events,
+ * pass an array with the names of the events to suppress.
+ *
+ * Example usage:
+ *
+ * <a ion-button [core-suppress-events] (onClick)="toggle($event)">
+ */
+@Directive({
+    selector: '[core-suppress-events]'
+})
+export class CoreSupressEventsDirective implements OnInit {
+    @Input('core-suppress-events') suppressEvents: string | string[];
+    @Output() onClick = new EventEmitter();
+
+    protected element: HTMLElement;
+
+    constructor(el: ElementRef) {
+        this.element = el.nativeElement;
+    }
+
+    /**
+     * Initialize event listeners.
+     */
+    ngOnInit(): void {
+        let events: string[];
+
+        if (this.suppressEvents == 'all' || typeof this.suppressEvents == 'undefined' || this.suppressEvents === null) {
+            // Suppress all events.
+            events = ['click', 'mousedown', 'touchdown', 'touchmove', 'touchstart'];
+
+        } else if (typeof this.suppressEvents == 'string') {
+            // It's a string, just suppress this event.
+            events = [this.suppressEvents];
+
+        } else if (Array.isArray(this.suppressEvents)) {
+            // Array supplied.
+            events = this.suppressEvents;
+        } else {
+            events = [];
+        }
+
+        // Suppress the events.
+        for (const evName of events) {
+            this.element.addEventListener(evName, this.stopBubble.bind(this));
+        }
+
+        // Now listen to "click" events.
+        this.element.addEventListener('mouseup', (event) => { // Triggered in Android & iOS.
+            this.onClick.emit(event);
+        });
+
+        this.element.addEventListener('touchend', (event) => { // Triggered desktop & browser.
+            this.stopBubble(event);
+            this.onClick.emit(event);
+        });
+    }
+
+    /**
+     * Stop event default and propagation.
+     *
+     * @param {Event} event Event.
+     */
+    protected stopBubble(event: Event): void {
+        event.preventDefault();
+        event.stopPropagation();
+    }
+}