diff --git a/packages/web/src/components/Dialog/ImportDialog.tsx b/packages/web/src/components/Dialog/ImportDialog.tsx
index 339dd733..12889bbc 100644
--- a/packages/web/src/components/Dialog/ImportDialog.tsx
+++ b/packages/web/src/components/Dialog/ImportDialog.tsx
@@ -20,6 +20,7 @@ import {
 } from "@components/UI/Select.tsx";
 import { Switch } from "@components/UI/Switch.tsx";
 import { useDevice } from "@core/stores";
+import { deepCompareConfig } from "@core/utils/deepCompareConfig.ts";
 import { Protobuf } from "@meshtastic/core";
 import { toByteArray } from "base64-js";
 import { useEffect, useState } from "react";
@@ -32,7 +33,7 @@ export interface ImportDialogProps {
 }
 
 export const ImportDialog = ({ open, onOpenChange }: ImportDialogProps) => {
-  const { config } = useDevice();
+  const { config, channels } = useDevice();
   const { t } = useTranslation("dialog");
   const [importDialogInput, setImportDialogInput] = useState<string>("");
   const [channelSet, setChannelSet] = useState<Protobuf.AppOnly.ChannelSet>();
@@ -89,31 +90,45 @@ export const ImportDialog = ({ open, onOpenChange }: ImportDialogProps) => {
           return;
         }
 
-        setWorkingChannelConfig(
-          create(Protobuf.Channel.ChannelSchema, {
-            index: importIndex[index],
-            role:
-              importIndex[index] === 0
-                ? Protobuf.Channel.Channel_Role.PRIMARY
-                : Protobuf.Channel.Channel_Role.SECONDARY,
-            settings: ch,
-          }),
-        );
+        const payload = create(Protobuf.Channel.ChannelSchema, {
+          index: importIndex[index],
+          role:
+            importIndex[index] === 0
+              ? Protobuf.Channel.Channel_Role.PRIMARY
+              : Protobuf.Channel.Channel_Role.SECONDARY,
+          settings: ch,
+        });
+
+        if (
+          deepCompareConfig(
+            channels.get(importIndex[index] ?? 0),
+            payload,
+            true,
+          )
+        ) {
+          return;
+        }
+
+        setWorkingChannelConfig(payload);
       },
     );
 
     if (channelSet?.loraConfig && updateConfig) {
-      setWorkingConfig(
-        create(Protobuf.Config.ConfigSchema, {
-          payloadVariant: {
-            case: "lora",
-            value: {
-              ...config.lora,
-              ...channelSet.loraConfig,
-            },
+      const payload = create(Protobuf.Config.ConfigSchema, {
+        payloadVariant: {
+          case: "lora",
+          value: {
+            ...config.lora,
+            ...channelSet.loraConfig,
           },
-        }),
-      );
+        },
+      });
+
+      if (deepCompareConfig(config.lora, payload, true)) {
+        return;
+      }
+
+      setWorkingConfig(payload);
     }
     // Reset state after import
     setImportDialogInput("");
@@ -180,7 +195,7 @@ export const ImportDialog = ({ open, onOpenChange }: ImportDialogProps) => {
                 {channelSet?.settings.map((channel, index) => (
                   <div
                     className="flex items-center"
-                    key={`channel_${channel.id}`}
+                    key={`channel_${channel.id}_${index}`}
                   >
                     <Label className="flex-1">
                       {channel.name.length
@@ -207,7 +222,7 @@ export const ImportDialog = ({ open, onOpenChange }: ImportDialogProps) => {
                           </SelectItem>
                         ))}
                         <SelectItem value="-1">
-                          {t("import.noNotImport")}
+                          {t("import.doNotImport")}
                         </SelectItem>
                       </SelectContent>
                     </Select>
diff --git a/packages/web/src/pages/Config/index.tsx b/packages/web/src/pages/Config/index.tsx
index 5c08259b..82ed22a1 100644
--- a/packages/web/src/pages/Config/index.tsx
+++ b/packages/web/src/pages/Config/index.tsx
@@ -214,7 +214,7 @@ const ConfigPage = () => {
     workingChannelConfig.length > 0;
   const isValid = isValidForm();
   const isDirty = isDirtyForm();
-  const hasPending = hasDrafts || isDirty;
+  const hasPending = formMethods?.formState.isReady && (hasDrafts || isDirty);
   const buttonOpacity = hasPending ? "opacity-100" : "opacity-0";
   const saveDisabled = isSaving || !isValid || !hasPending;
 
@@ -247,9 +247,10 @@ const ConfigPage = () => {
         icon: !isValid ? SaveOff : SaveIcon,
         isLoading: isSaving,
         disabled: saveDisabled,
-        iconClasses: !isValid
-          ? "text-red-400 cursor-not-allowed"
-          : "cursor-pointer",
+        iconClasses:
+          isDirty && !isValid
+            ? "text-red-400 cursor-not-allowed"
+            : "cursor-pointer",
         className: cn([
           "transition-opacity hover:bg-slate-200 disabled:hover:bg-white",
           "hover:dark:bg-slate-300 hover:dark:text-black",
@@ -262,6 +263,7 @@ const ConfigPage = () => {
     [
       isSaving,
       isValid,
+      isDirty,
       saveDisabled,
       buttonOpacity,
       handleReset,