diff --git a/give.php b/give.php
index c0f6fe0492..080903fbb7 100644
--- a/give.php
+++ b/give.php
@@ -6,7 +6,7 @@
  * Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
  * Author: GiveWP
  * Author URI: https://givewp.com/
- * Version: 3.6.1
+ * Version: 3.6.2
  * Requires at least: 6.0
  * Requires PHP: 7.2
  * Text Domain: give
@@ -404,7 +404,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '3.6.1');
+            define('GIVE_VERSION', '3.6.2');
         }
 
         // Plugin Root File.
diff --git a/readme.txt b/readme.txt
index 167edafb8e..49ca1d2ae0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,9 +3,9 @@ Contributors: givewp, dlocc, webdevmattcrom, ravinderk, mehul0810, kevinwhoffman
 Donate link: https://go.givewp.com/home
 Tags: donation, donate, recurring donations, fundraising, crowdfunding
 Requires at least: 6.0
-Tested up to: 6.4
+Tested up to: 6.5
 Requires PHP: 7.2
-Stable tag: 3.6.1
+Stable tag: 3.6.2
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -262,6 +262,9 @@ The 2% fee on Stripe donations only applies to donations taken via our free Stri
 10. Use almost any payment gateway integration with GiveWP through our add-ons or by creating your own add-on.
 
 == Changelog ==
+= 3.6.2: April 4th, 2024 =
+* Fix: Resolved an issue with WordPress 6.5 and the visual form builder that was making it difficult to interact with blocks
+
 = 3.6.1: March 21st, 2024 =
 * Fix: Resolved an issue with PayPal donations and currency switcher on donation forms using the visual form builder
 
diff --git a/src/FormBuilder/resources/js/form-builder/src/containers/BlockEditorContainer.tsx b/src/FormBuilder/resources/js/form-builder/src/containers/BlockEditorContainer.tsx
index 71847dc326..837f66bcba 100644
--- a/src/FormBuilder/resources/js/form-builder/src/containers/BlockEditorContainer.tsx
+++ b/src/FormBuilder/resources/js/form-builder/src/containers/BlockEditorContainer.tsx
@@ -10,12 +10,19 @@ import {__} from "@wordpress/i18n";
 
 
 /**
+ * @since 3.6.2 Early return dispatchFormBlocks if there are no unwrapped blocks.
  * @since 3.0.0
  */
 export default function BlockEditorContainer() {
     const {blocks} = useFormState();
     const dispatch = useFormStateDispatch();
     const dispatchFormBlocks = (blocks) => {
+        const hasUnwrappedBlocks = blocks.some((block) => block.name !== 'givewp/section');
+
+        if (!hasUnwrappedBlocks) {
+            return dispatch(setFormBlocks(blocks));
+        }
+
         dispatch(setFormBlocks(blocks.map((block) => {
             return block.name == 'givewp/section'
                 ? block
diff --git a/src/FormBuilder/resources/js/form-builder/src/styles/_block-editor.scss b/src/FormBuilder/resources/js/form-builder/src/styles/_block-editor.scss
index 50524e8383..5608fd7aab 100644
--- a/src/FormBuilder/resources/js/form-builder/src/styles/_block-editor.scss
+++ b/src/FormBuilder/resources/js/form-builder/src/styles/_block-editor.scss
@@ -70,6 +70,7 @@
         font-size: 16px !important;
         font-weight: normal;
         line-height: 20px;
+        height: auto;
     }
 
     .components-select-control__input {