diff --git a/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx b/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx
index 0b7af6dea..6ffb84da6 100644
--- a/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx
+++ b/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx
@@ -105,14 +105,11 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBas
   const displayProperties = issuesFilterStore?.issueFilters?.displayProperties || null;
 
   const sub_group_by: string | null = displayFilters?.sub_group_by || null;
-
   const group_by: string | null = displayFilters?.group_by || null;
 
-  const order_by: string | null = displayFilters?.order_by || null;
-
   const userDisplayFilters = displayFilters || null;
 
-  const currentKanBanView: "swimlanes" | "default" = sub_group_by ? "swimlanes" : "default";
+  const KanBanView = sub_group_by ? KanBanSwimLanes : KanBan;
 
   const { enableInlineEditing, enableQuickAdd, enableIssueCreation } = issueStore?.viewFlags || {};
 
@@ -256,48 +253,25 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBas
             </Droppable>
           </div>
 
-          {currentKanBanView === "default" ? (
-            <KanBan
-              issues={issues}
-              issueIds={issueIds}
-              sub_group_by={sub_group_by}
-              group_by={group_by}
-              handleIssues={handleIssues}
-              quickActions={renderQuickActions}
-              displayProperties={displayProperties}
-              kanBanToggle={kanbanViewStore?.kanBanToggle}
-              handleKanBanToggle={handleKanBanToggle}
-              enableQuickIssueCreate={enableQuickAdd}
-              showEmptyGroup={userDisplayFilters?.show_empty_groups || true}
-              quickAddCallback={issueStore?.quickAddIssue}
-              viewId={viewId}
-              disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
-              canEditProperties={canEditProperties}
-              currentStore={currentStore}
-              addIssuesToView={addIssuesToView}
-            />
-          ) : (
-            <KanBanSwimLanes
-              issues={issues}
-              issueIds={issueIds}
-              sub_group_by={sub_group_by}
-              group_by={group_by}
-              order_by={order_by}
-              handleIssues={handleIssues}
-              quickActions={renderQuickActions}
-              displayProperties={displayProperties}
-              kanBanToggle={kanbanViewStore?.kanBanToggle}
-              handleKanBanToggle={handleKanBanToggle}
-              showEmptyGroup={userDisplayFilters?.show_empty_groups || true}
-              isDragStarted={isDragStarted}
-              disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
-              enableQuickIssueCreate={enableQuickAdd}
-              currentStore={currentStore}
-              quickAddCallback={issueStore?.quickAddIssue}
-              addIssuesToView={addIssuesToView}
-              canEditProperties={canEditProperties}
-            />
-          )}
+          <KanBanView
+            issues={issues}
+            issueIds={issueIds}
+            sub_group_by={sub_group_by}
+            group_by={group_by}
+            handleIssues={handleIssues}
+            quickActions={renderQuickActions}
+            displayProperties={displayProperties}
+            kanBanToggle={kanbanViewStore?.kanBanToggle}
+            handleKanBanToggle={handleKanBanToggle}
+            enableQuickIssueCreate={enableQuickAdd}
+            showEmptyGroup={userDisplayFilters?.show_empty_groups || true}
+            quickAddCallback={issueStore?.quickAddIssue}
+            viewId={viewId}
+            disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
+            canEditProperties={canEditProperties}
+            currentStore={currentStore}
+            addIssuesToView={addIssuesToView}
+          />
         </DragDropContext>
       </div>
 
diff --git a/web/components/issues/issue-layouts/kanban/default.tsx b/web/components/issues/issue-layouts/kanban/default.tsx
index a64847b4f..78de35776 100644
--- a/web/components/issues/issue-layouts/kanban/default.tsx
+++ b/web/components/issues/issue-layouts/kanban/default.tsx
@@ -1,4 +1,3 @@
-import React from "react";
 import { observer } from "mobx-react-lite";
 // mobx store
 import { useMobxStore } from "lib/mobx/store-provider";
diff --git a/web/components/issues/issue-layouts/kanban/swimlanes.tsx b/web/components/issues/issue-layouts/kanban/swimlanes.tsx
index f7f70b8b5..0de48bb45 100644
--- a/web/components/issues/issue-layouts/kanban/swimlanes.tsx
+++ b/web/components/issues/issue-layouts/kanban/swimlanes.tsx
@@ -1,4 +1,3 @@
-import React from "react";
 import { observer } from "mobx-react-lite";
 //mobx
 import { useMobxStore } from "lib/mobx/store-provider";
@@ -54,7 +53,6 @@ const SubGroupSwimlaneHeader: React.FC<ISubGroupSwimlaneHeader> = ({
 interface ISubGroupSwimlane extends ISubGroupSwimlaneHeader {
   issues: IIssueResponse;
   issueIds: any;
-  order_by: string | null;
   showEmptyGroup: boolean;
   handleIssues: (issue: IIssue, action: EIssueActions) => void;
   quickActions: (issue: IIssue, customActionButton?: React.ReactElement) => React.ReactNode;
@@ -73,6 +71,7 @@ interface ISubGroupSwimlane extends ISubGroupSwimlaneHeader {
     data: IIssue,
     viewId?: string
   ) => Promise<IIssue | undefined>;
+  viewId?: string;
 }
 const SubGroupSwimlane: React.FC<ISubGroupSwimlane> = observer((props) => {
   const {
@@ -91,6 +90,7 @@ const SubGroupSwimlane: React.FC<ISubGroupSwimlane> = observer((props) => {
     canEditProperties,
     addIssuesToView,
     quickAddCallback,
+    viewId,
   } = props;
 
   const calculateIssueCount = (column_id: string) => {
@@ -139,6 +139,7 @@ const SubGroupSwimlane: React.FC<ISubGroupSwimlane> = observer((props) => {
                   canEditProperties={canEditProperties}
                   addIssuesToView={addIssuesToView}
                   quickAddCallback={quickAddCallback}
+                  viewId={viewId}
                 />
               </div>
             )}
@@ -153,7 +154,6 @@ export interface IKanBanSwimLanes {
   issueIds: IGroupedIssues | ISubGroupedIssues | TUnGroupedIssues;
   sub_group_by: string | null;
   group_by: string | null;
-  order_by: string | null;
   handleIssues: (issue: IIssue, action: EIssueActions) => void;
   quickActions: (issue: IIssue, customActionButton?: React.ReactElement) => React.ReactNode;
   displayProperties: IIssueDisplayProperties | null;
@@ -171,6 +171,7 @@ export interface IKanBanSwimLanes {
     data: IIssue,
     viewId?: string
   ) => Promise<IIssue | undefined>;
+  viewId?: string;
   canEditProperties: (projectId: string | undefined) => boolean;
 }
 
@@ -180,7 +181,6 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
     issueIds,
     sub_group_by,
     group_by,
-    order_by,
     handleIssues,
     quickActions,
     displayProperties,
@@ -193,6 +193,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
     canEditProperties,
     addIssuesToView,
     quickAddCallback,
+    viewId,
   } = props;
 
   const { project, projectLabel, projectMember, projectState } = useMobxStore();
@@ -228,7 +229,6 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           issueIds={issueIds}
           group_by={group_by}
           sub_group_by={sub_group_by}
-          order_by={order_by}
           handleIssues={handleIssues}
           quickActions={quickActions}
           displayProperties={displayProperties}
@@ -241,6 +241,7 @@ export const KanBanSwimLanes: React.FC<IKanBanSwimLanes> = observer((props) => {
           addIssuesToView={addIssuesToView}
           canEditProperties={canEditProperties}
           quickAddCallback={quickAddCallback}
+          viewId={viewId}
         />
       )}
     </div>
diff --git a/web/styles/globals.css b/web/styles/globals.css
index e94a751f3..5d083b490 100644
--- a/web/styles/globals.css
+++ b/web/styles/globals.css
@@ -540,3 +540,5 @@ div.web-view-spinner div.bar12 {
   animation-delay: -0.0833s;
   -webkit-animation-delay: -0.0833s;
 }
+[data-rfd-draggable-id] { will-change: transform, opacity; }
+