diff --git a/src/components/dashboard/DashboardTopbar.tsx b/src/components/dashboard/DashboardTopbar.tsx
index 97162c6e..1fecffe4 100644
--- a/src/components/dashboard/DashboardTopbar.tsx
+++ b/src/components/dashboard/DashboardTopbar.tsx
@@ -46,7 +46,7 @@ export const DashboardTopbar: React.FC<{
               leaveFrom="opacity-100 transform translate-x-0"
               leaveTo="opacity-0 transform -translate-x-full"
             >
-              <Popover.Panel className="fixed bg-slate-50 h-screen left-0 top-0 z-20 w-sidebar transform sm:px-0 lg:max-w-3xl">
+              <Popover.Panel className="fixed bg-slate-50 h-full left-0 top-0 z-20 w-sidebar transform sm:px-0 lg:max-w-3xl">
                 <div className="overflow-hidden rounded-lg shadow-lg ring-1 ring-black ring-opacity-5 h-full">
                   {drawerWidget(close)}
                 </div>
diff --git a/src/components/dashboard/OptionsButton.tsx b/src/components/dashboard/OptionsButton.tsx
index d1f350de..691f3c01 100644
--- a/src/components/dashboard/OptionsButton.tsx
+++ b/src/components/dashboard/OptionsButton.tsx
@@ -58,7 +58,7 @@ export const OptionsButton: React.FC<{
                 leaveFrom="transform opacity-100 scale-100"
                 leaveTo="transform opacity-0 scale-95"
               >
-                <Menu.Items className="absolute right-0 mt-2 w-56 origin-top-right divide-y divide-gray-100 rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+                <Menu.Items className="absolute right-0 mt-2 z-30 w-56 origin-top-right divide-y divide-gray-100 rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
                   <div className="px-1 py-1 ">
                     <Menu.Item disabled>
                       {({ active }) => (
@@ -158,7 +158,7 @@ export const OptionsButton: React.FC<{
               leaveFrom="opacity-100 transform translate-x-0"
               leaveTo="opacity-0 transform -translate-x-full"
             >
-              <Popover.Panel className="fixed bg-slate-50 h-screen left-0 top-0 z-30 transform sm:px-0 lg:max-w-3xl">
+              <Popover.Panel className="fixed bg-slate-50 h-full left-0 top-0 z-30 transform sm:px-0 lg:max-w-3xl">
                 <div className="overflow-hidden rounded-lg shadow-lg ring-1 ring-black ring-opacity-5 h-full">
                   {propertiesWidget}
                 </div>
diff --git a/src/pages/dashboard/[subdomain]/editor.tsx b/src/pages/dashboard/[subdomain]/editor.tsx
index 8abd7207..5a07be1f 100644
--- a/src/pages/dashboard/[subdomain]/editor.tsx
+++ b/src/pages/dashboard/[subdomain]/editor.tsx
@@ -616,10 +616,10 @@ export default function SubdomainEditor() {
               )}
             </header>
             <div
-              className={`h-screen pt-14 flex w-full ${
+              className={`pt-14 flex w-full ${
                 isMobileLayout
                   ? "w-screen h-[calc(100vh-4rem)]"
-                  : "min-w-[840px]"
+                  : "min-w-[840px] h-screen "
               }`}
             >
               <div className="h-full overflow-auto w-full">