diff --git a/components/apolloTable/component/Table.tsx b/components/apolloTable/component/Table.tsx
index 0a23587a961a50e226d1b5583684319da114dc45..ccd1e4345ca8a102be515398a9911acdc8340f76 100644
--- a/components/apolloTable/component/Table.tsx
+++ b/components/apolloTable/component/Table.tsx
@@ -759,7 +759,7 @@ export default class AirTable extends Component<TableProps, TableState> {
                                             style={{
                                                 width: `${rightWidth}px`,
                                                 height: `${totalHeight - scrollbarWidth + headerHeight}px`,
-                                                right: scrollbarWidth,
+                                                right: paddingRight,
                                             }}
                                         >
                                             {
diff --git a/components/apolloTable/component/base/edit/container/index.tsx b/components/apolloTable/component/base/edit/container/index.tsx
index 7084e59ea9c8534eb0837f201c76bda0c520dafc..87bab5788d3bf168b6595b4424b230854324671a 100644
--- a/components/apolloTable/component/base/edit/container/index.tsx
+++ b/components/apolloTable/component/base/edit/container/index.tsx
@@ -31,7 +31,7 @@ export default function CellContainer<P extends Props>(Comp) {
         };
         onBlur = (e: any) => {
             let currTarget = e.target;
-            while (currTarget != document) {
+            while (currTarget && currTarget != document) {
                 let editing = currTarget.getAttribute('data-editing-cell');
                 // 当前点击div是正在编辑的cell时，阻止修改回调
                 if (editing === '1') {