diff --git a/app/mattermost.js b/app/mattermost.js
index 076e7d270..086c41a70 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -10,6 +10,7 @@ import {
     Alert,
     AppState,
     InteractionManager,
+    Keyboard,
     NativeModules,
     Platform
 } from 'react-native';
@@ -194,6 +195,7 @@ export default class Mattermost {
                     }
                 } else if (isActive) {
                     this.inBackgroundSince = null;
+                    Keyboard.dismiss();
                 }
             } catch (error) {
                 // do nothing