diff --git a/Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart b/Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart
index 03d44871..176d26bb 100644
--- a/Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart
+++ b/Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart
@@ -191,18 +191,21 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                             ),
                             decoration: InputDecoration(
                               suffixIcon: widget.passwordMode == true
-                                  ? IconButton(
-                                      icon: Icon(
-                                        _obscureText
-                                            ? Icons.visibility_off
-                                            : Icons.visibility,
-                                        color: widget.inputColor,
+                                  ? FocusScope(
+                                      canRequestFocus: false,
+                                      child: IconButton(
+                                        icon: Icon(
+                                          _obscureText
+                                              ? Icons.visibility_off
+                                              : Icons.visibility,
+                                          color: widget.inputColor,
+                                        ),
+                                        onPressed: () {
+                                          setState(() {
+                                            _obscureText = !_obscureText;
+                                          });
+                                        },
                                       ),
-                                      onPressed: () {
-                                        setState(() {
-                                          _obscureText = !_obscureText;
-                                        });
-                                      },
                                     )
                                   : null,
                               errorStyle: const TextStyle(