diff --git a/setting/index.js b/setting/index.js
index 413acc6..fa2406c 100644
--- a/setting/index.js
+++ b/setting/index.js
@@ -31,7 +31,7 @@ function GetTOTPList(storage) {
                 editingIndex = index;
                 tempIssuer = element.issuer;
                 tempClient = element.client;
-                updateStorage(storage);
+                _props.settingsStorage.setItem("requestUpdate", Math.random());
             },
             onSave: () => {
                 storage[index].issuer = tempIssuer;
@@ -61,6 +61,7 @@ function GetTOTPList(storage) {
                     updateStorage(storage);
                 }
             },
+            isEditInProgress: editingIndex !== -1,
         });
     });
 }
@@ -119,7 +120,7 @@ AppSettingsPage({
                 display: "flex",
                 alignItems: "center",
                 justifyContent: "center",
-                margin: "10px",
+                marginBottom: "10px",
                 fontSize: "20px",
                 color: colors.text,
                 borderRadius: "5px",
@@ -151,8 +152,8 @@ AppSettingsPage({
                         style: {
                             display: "flex",
                             justifyContent: "center",
-                            marginTop: "20px",
-                            marginBottom: "20px",
+                            marginTop: "10px",
+                            marginBottom: "10px",
                         },
                     },
                     Link(
diff --git a/setting/ui/card.js b/setting/ui/card.js
index f9f058f..be9f041 100644
--- a/setting/ui/card.js
+++ b/setting/ui/card.js
@@ -14,6 +14,7 @@ export function createTOTPCard({
     onMoveDown,
     onIssuerChange,
     onClientChange,
+    isEditInProgress
 }) {
     const infoView = View(
         {
@@ -108,6 +109,7 @@ export function createTOTPCard({
                       },
                       onClick: onRename,
                   }),
+                  !isEditInProgress ?
                   Button({
                       label: "Delete",
                       style: {
@@ -116,7 +118,7 @@ export function createTOTPCard({
                           color: colors.text,
                       },
                       onClick: onDelete,
-                  }),
+                  }): null,
               ],
     );