diff --git a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
index dbac224fe6..e061bdb357 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -159,11 +159,13 @@ module.exports = {
       .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ioedeveloper/test-branch-change')
       .click('[data-id="fileSystem-modal-footer-ok-react"]')
       .waitForElementPresent('.fa-spinner')
-      .pause(5000)
+      .pause(7000)
       .waitForElementNotPresent('.fa-spinner')
       .waitForElementContainsText('[data-id="workspacesSelect"]', 'test-branch-change')
       .waitForElementVisible('[data-id="workspaceGitPanel"]')
+      .waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]')
       .click('[data-id="workspaceGitBranchesDropdown"]')
+      .pause()
       .waitForElementVisible('[data-id="custom-dropdown-menu"]')
       .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/dev')
       .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/production')
@@ -312,6 +314,7 @@ module.exports = {
   'When switching branches the submodules should disappear #group4': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]')
+      .pause()
       .click('[data-id="workspaceGitBranchesDropdown"]')
       .waitForElementVisible('[data-id="custom-dropdown-menu"]')
       .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/empty')
diff --git a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx
index dec5f2400c..d210802229 100644
--- a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx
@@ -27,7 +27,7 @@ const DragBar = (props: IRemixDragBarUi) => {
         const width = window.innerWidth
         const height = window.innerHeight
 
-        if (height < 781 && width < 1150) {
+        if (height <= 781 && width <= 1150) {
           setDragBarPosX(props.minWidth + 50)
         } else {
           setDragBarPosX(props.minWidth)