diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 5595c3a0e38..6a22294e725 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1562,10 +1562,10 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
     t->animtimer = (animscreen) ? animscreen->animtimer : NULL;
 
     /* turn gizmo off during transform */
-    if (t->flag & T_MODAL) {
-      t->gizmo_flag = v3d->gizmo_flag;
-      v3d->gizmo_flag = V3D_GIZMO_HIDE;
-    }
+    // if (t->flag & T_MODAL) {
+    //   t->gizmo_flag = v3d->gizmo_flag;
+    //   v3d->gizmo_flag = V3D_GIZMO_HIDE;
+    // }
 
     if (t->scene->toolsettings->transform_flag & SCE_XFORM_AXIS_ALIGN) {
       t->flag |= T_V3D_ALIGN;
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index b3c1fbd3aad..2b42d441686 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -1988,9 +1988,9 @@ static bool WIDGETGROUP_gizmo_poll_generic(View3D *v3d)
   if (v3d->gizmo_flag & V3D_GIZMO_HIDE) {
     return false;
   }
-  if (G.moving & (G_TRANSFORM_OBJ | G_TRANSFORM_EDIT)) {
-    return false;
-  }
+  // if (G.moving & (G_TRANSFORM_OBJ | G_TRANSFORM_EDIT)) {
+  //   return false;
+  // }
   return true;
 }
 
@@ -2047,7 +2047,7 @@ void VIEW3D_GGT_xform_gizmo(wmGizmoGroupType *gzgt)
   gzgt->idname = "VIEW3D_GGT_xform_gizmo";
 
   gzgt->flag = WM_GIZMOGROUPTYPE_3D | WM_GIZMOGROUPTYPE_TOOL_FALLBACK_KEYMAP |
-               WM_GIZMOGROUPTYPE_DELAY_REFRESH_FOR_TWEAK;
+               WM_GIZMOGROUPTYPE_DELAY_REFRESH_FOR_TWEAK | WM_GIZMOGROUPTYPE_DRAW_MODAL_ALL;
 
   gzgt->gzmap_params.spaceid = SPACE_VIEW3D;
   gzgt->gzmap_params.regionid = RGN_TYPE_WINDOW;