diff --git a/README.md b/README.md
index 1bf73dcf..7dff5cb5 100644
--- a/README.md
+++ b/README.md
@@ -624,6 +624,7 @@ Widget build(BuildContext context) {
                   hintStyle: const TextStyle(fontSize: 12),
                   border: OutlineInputBorder(
                     borderRadius: BorderRadius.circular(8),
+                    gapPadding: 0,
                   ),
                 ),
               ),
@@ -638,7 +639,7 @@ Widget build(BuildContext context) {
           ),
           //This to clear the search value when you close the menu
           onMenuStateChange: (isOpen) {
-            if (!isOpen) {
+            if (!isOpen && mounted) {
               textEditingController.clear();
             }
           },
@@ -948,6 +949,7 @@ Widget build(BuildContext context) {
                 hintStyle: const TextStyle(fontSize: 14),
                 border: OutlineInputBorder(
                   borderRadius: BorderRadius.circular(15),
+                  gapPadding: 0,
                 ),
               ),
             ),
@@ -959,6 +961,7 @@ Widget build(BuildContext context) {
                     const EdgeInsets.symmetric(vertical: 16, horizontal: 16),
                 border: OutlineInputBorder(
                   borderRadius: BorderRadius.circular(15),
+                  gapPadding: 0,
                 ),
                 // Add more decoration..
               ),
diff --git a/packages/dropdown_button2_test/lib/src/form_field_example.dart b/packages/dropdown_button2_test/lib/src/form_field_example.dart
index ad15c0ef..8372ad67 100644
--- a/packages/dropdown_button2_test/lib/src/form_field_example.dart
+++ b/packages/dropdown_button2_test/lib/src/form_field_example.dart
@@ -34,6 +34,7 @@ class _FormFieldExampleState extends State<FormFieldExample> {
                   hintStyle: const TextStyle(fontSize: 14),
                   border: OutlineInputBorder(
                     borderRadius: BorderRadius.circular(15),
+                    gapPadding: 0,
                   ),
                 ),
               ),
@@ -44,6 +45,7 @@ class _FormFieldExampleState extends State<FormFieldExample> {
                   contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 16),
                   border: OutlineInputBorder(
                     borderRadius: BorderRadius.circular(15),
+                    gapPadding: 0,
                   ),
                   // Add more decoration..
                 ),
diff --git a/packages/dropdown_button2_test/lib/src/search_example.dart b/packages/dropdown_button2_test/lib/src/search_example.dart
index 9dbaf358..5efa4c1f 100644
--- a/packages/dropdown_button2_test/lib/src/search_example.dart
+++ b/packages/dropdown_button2_test/lib/src/search_example.dart
@@ -88,6 +88,7 @@ class _SearchExampleState extends State<SearchExample> {
                     hintStyle: const TextStyle(fontSize: 12),
                     border: OutlineInputBorder(
                       borderRadius: BorderRadius.circular(8),
+                      gapPadding: 0,
                     ),
                   ),
                 ),
@@ -102,7 +103,7 @@ class _SearchExampleState extends State<SearchExample> {
             ),
             //This to clear the search value when you close the menu
             onMenuStateChange: (isOpen) {
-              if (!isOpen) {
+              if (!isOpen && mounted) {
                 textEditingController.clear();
               }
             },
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/desktop_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/desktop_closed_menu.png
index c66d5431..4ea97de8 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/desktop_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/desktop_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/desktop_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/desktop_open_menu.png
index a8c256b1..c766d5ef 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/desktop_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/desktop_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/ipad_pro_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/ipad_pro_closed_menu.png
index 38cc8bf9..78fff21d 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/ipad_pro_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/ipad_pro_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/ipad_pro_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/ipad_pro_open_menu.png
index 5e72b0fa..07f1896a 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/ipad_pro_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/ipad_pro_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_14_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_14_closed_menu.png
index 5054b001..36ea2cf5 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_14_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_14_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_14_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_14_open_menu.png
index 3d429d64..566d3ab1 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_14_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_14_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_8_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_8_closed_menu.png
index b6ed2a92..139515e4 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_8_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_8_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_8_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_8_open_menu.png
index 485fb0b9..6ef23cdf 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_8_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/iphone_8_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/pixel_5_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/pixel_5_closed_menu.png
index 2d1fa0f1..c65e2023 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/pixel_5_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/pixel_5_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/pixel_5_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/pixel_5_open_menu.png
index 0d5c476c..cf3d8595 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/pixel_5_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/few_styling_example/pixel_5_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/desktop_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/desktop_closed_menu.png
index fbe61099..d63881dd 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/desktop_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/desktop_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/desktop_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/desktop_open_menu.png
index bafef3b2..32012a10 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/desktop_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/desktop_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/ipad_pro_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/ipad_pro_closed_menu.png
index 459fbcc3..6c3b6d2c 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/ipad_pro_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/ipad_pro_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/ipad_pro_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/ipad_pro_open_menu.png
index ca22a293..730121fc 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/ipad_pro_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/ipad_pro_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_14_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_14_closed_menu.png
index 07ca79b5..0cf71d84 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_14_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_14_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_14_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_14_open_menu.png
index 1c534f36..06d06566 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_14_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_14_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_8_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_8_closed_menu.png
index 9d2aca87..b74767c8 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_8_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_8_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_8_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_8_open_menu.png
index 472b814a..d331a8ba 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_8_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/iphone_8_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/pixel_5_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/pixel_5_closed_menu.png
index b738cd20..c726fc86 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/pixel_5_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/pixel_5_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/pixel_5_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/pixel_5_open_menu.png
index 377b6691..deff539e 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/form_field_example/pixel_5_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/form_field_example/pixel_5_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/desktop_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/desktop_closed_menu.png
index 839067da..84742c6b 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/desktop_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/desktop_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/desktop_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/desktop_open_menu.png
index 9eeb7449..d41e6c8e 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/desktop_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/desktop_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/ipad_pro_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/ipad_pro_closed_menu.png
index 4fe2f327..2b123276 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/ipad_pro_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/ipad_pro_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/ipad_pro_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/ipad_pro_open_menu.png
index 15d0407c..1af69b86 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/ipad_pro_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/ipad_pro_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_14_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_14_closed_menu.png
index 9468e249..5a1e558f 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_14_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_14_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_14_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_14_open_menu.png
index 49374516..85fed045 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_14_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_14_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_8_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_8_closed_menu.png
index efcc9cf6..878c534d 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_8_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_8_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_8_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_8_open_menu.png
index d9fb467d..05341718 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_8_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/iphone_8_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/pixel_5_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/pixel_5_closed_menu.png
index b89bd50c..d806f830 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/pixel_5_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/pixel_5_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/pixel_5_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/pixel_5_open_menu.png
index b290f90f..23f63b7e 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/pixel_5_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_icon_example/pixel_5_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/desktop_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/desktop_closed_menu.png
index 2eaea561..731d42b0 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/desktop_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/desktop_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/desktop_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/desktop_open_menu.png
index e9b7824b..309c7918 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/desktop_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/desktop_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/ipad_pro_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/ipad_pro_closed_menu.png
index e8441151..2db265d3 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/ipad_pro_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/ipad_pro_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/ipad_pro_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/ipad_pro_open_menu.png
index 9a26ddeb..d8ee1bef 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/ipad_pro_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/ipad_pro_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_14_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_14_closed_menu.png
index afc22486..344547cb 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_14_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_14_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_14_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_14_open_menu.png
index 8dedab88..2b40746d 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_14_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_14_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_8_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_8_closed_menu.png
index bb55f977..812f1527 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_8_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_8_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_8_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_8_open_menu.png
index 4f50d940..2cc96f80 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_8_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/iphone_8_open_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/pixel_5_closed_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/pixel_5_closed_menu.png
index b82ed03f..df3a9f8c 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/pixel_5_closed_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/pixel_5_closed_menu.png differ
diff --git a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/pixel_5_open_menu.png b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/pixel_5_open_menu.png
index 1dfd56d2..629b3020 100644
Binary files a/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/pixel_5_open_menu.png and b/packages/dropdown_button2_test/test/examples/goldens/popup_image_example/pixel_5_open_menu.png differ