diff --git a/flutter_hbb/lib/common.dart b/flutter_hbb/lib/common.dart
index fef4ed0bd..9bb4c9b7d 100644
--- a/flutter_hbb/lib/common.dart
+++ b/flutter_hbb/lib/common.dart
@@ -129,9 +129,9 @@ class _PasswordWidgetState extends State<PasswordWidget> {
   Widget build(BuildContext context) {
     return TextField(
       autofocus: true,
-      keyboardType: TextInputType.text,
       controller: widget.controller,
       obscureText: !_passwordVisible, //This will obscure text dynamically
+      keyboardType: TextInputType.visiblePassword,
       decoration: InputDecoration(
         labelText: 'Password',
         hintText: 'Enter your password',
diff --git a/flutter_hbb/lib/home_page.dart b/flutter_hbb/lib/home_page.dart
index a9e1da622..36757d840 100644
--- a/flutter_hbb/lib/home_page.dart
+++ b/flutter_hbb/lib/home_page.dart
@@ -145,13 +145,14 @@ class _HomePageState extends State<HomePage> {
                     child: TextField(
                       autocorrect: false,
                       enableSuggestions: false,
+                      keyboardType: TextInputType.visiblePassword,
+                      // keyboardType: TextInputType.number,
                       style: TextStyle(
                         fontFamily: 'WorkSans',
                         fontWeight: FontWeight.bold,
                         fontSize: 30,
                         color: Color(0xFF00B6F0),
                       ),
-                      // keyboardType: TextInputType.number,
                       decoration: InputDecoration(
                         labelText: 'Remote ID',
                         // hintText: 'Enter your remote ID',
diff --git a/flutter_hbb/lib/remote_page.dart b/flutter_hbb/lib/remote_page.dart
index ff7b97ed7..1e85d9125 100644
--- a/flutter_hbb/lib/remote_page.dart
+++ b/flutter_hbb/lib/remote_page.dart
@@ -317,7 +317,8 @@ class _RemotePageState extends State<RemotePage> {
                                 maxLines: null,
                                 initialValue:
                                     _value, // trick way to make backspace work always
-                                keyboardType: TextInputType.multiline,
+                                keyboardType: TextInputType
+                                    .visiblePassword, // must use visiblePassword here, if else when input '(', new ')' will be auto appended on android, cause our proboems
                                 onChanged: handleInput,
                               ),
                       ),