diff --git a/backend/src/main/java/com/rit/canteen/sales/controller/TerminalController.java b/backend/src/main/java/com/rit/canteen/sales/controller/TerminalController.java
index 7abf22ca..81cb3200 100644
--- a/backend/src/main/java/com/rit/canteen/sales/controller/TerminalController.java
+++ b/backend/src/main/java/com/rit/canteen/sales/controller/TerminalController.java
@@ -78,6 +78,16 @@ public class TerminalController {
         return ResponseEntity.noContent().build();
     }
 
+    @PutMapping("/{id}")
+    public ResponseEntity<?> updateTerminal(@PathVariable Long id, @jakarta.validation.Valid @RequestBody Terminal terminalDetails) {
+        Terminal updated = terminalService.updateTerminal(id, terminalDetails);
+        if (updated != null) {
+            return ResponseEntity.ok(updated);
+        } else {
+            return ResponseEntity.notFound().build();
+        }
+    }
+
     // ──────────────────────────────────────────────────────────────
     //  Order Lookup (ESP32 uses X-API-KEY)
     // ──────────────────────────────────────────────────────────────
diff --git a/backend/src/main/java/com/rit/canteen/sales/service/TerminalService.java b/backend/src/main/java/com/rit/canteen/sales/service/TerminalService.java
index 6316de65..445d2b37 100644
--- a/backend/src/main/java/com/rit/canteen/sales/service/TerminalService.java
+++ b/backend/src/main/java/com/rit/canteen/sales/service/TerminalService.java
@@ -43,4 +43,16 @@ public class TerminalService {
             terminalRepository.deleteById(id);
         }
     }
+
+    public Terminal updateTerminal(Long id, Terminal details) {
+        if (id == null) return null;
+        return terminalRepository.findById(id).map(existing -> {
+            existing.setName(details.getName());
+            existing.setLocation(details.getLocation());
+            if (details.getPin() != null && !details.getPin().trim().isEmpty()) {
+                existing.setPin(details.getPin().trim());
+            }
+            return terminalRepository.save(existing);
+        }).orElse(null);
+    }
 }
diff --git a/frontend/src/components/EditTerminalModal.tsx b/frontend/src/components/EditTerminalModal.tsx
new file mode 100644
index 00000000..baaec2a3
--- /dev/null
+++ b/frontend/src/components/EditTerminalModal.tsx
@@ -0,0 +1,187 @@
+import { apiFetch } from '../api';
+import React, { useState, useEffect } from 'react';
+import { motion, AnimatePresence } from 'framer-motion';
+import { X, Monitor, MapPin, Lock, Pencil } from 'lucide-react';
+import Numpad from './Numpad.tsx';
+
+interface EditTerminalModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onSuccess: () => void;
+  terminalId: number | null;
+  initialName: string;
+  initialLocation: string;
+}
+
+const EditTerminalModal: React.FC<EditTerminalModalProps> = ({ 
+  isOpen, onClose, onSuccess, terminalId, initialName, initialLocation 
+}) => {
+  const [name, setName] = useState(initialName);
+  const [location, setLocation] = useState(initialLocation);
+  const [pin, setPin] = useState('');
+  const [changePin, setChangePin] = useState(false);
+  const [step, setStep] = useState(1); // 1: Details, 2: PIN (optional)
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    if (isOpen) {
+      setName(initialName);
+      setLocation(initialLocation);
+      setPin('');
+      setChangePin(false);
+      setStep(1);
+    }
+  }, [isOpen, initialName, initialLocation]);
+
+  const handleSubmit = async () => {
+    if (!terminalId) return;
+    setLoading(true);
+    try {
+      const body: Record<string, string> = { name, location };
+      if (changePin && pin.length === 4) {
+        body.pin = pin;
+      }
+      const response = await apiFetch(`/api/terminals/${terminalId}`, {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(body),
+      });
+      if (response.ok) {
+        onSuccess();
+        onClose();
+      }
+    } catch (error) {
+      console.error('Failed to update terminal:', error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  if (!isOpen) return null;
+
+  return (
+    <div className="fixed inset-0 z-[60] flex items-center justify-center p-4 bg-black/40 backdrop-blur-sm">
+      <motion.div 
+        initial={{ opacity: 0, scale: 0.95, y: 20 }}
+        animate={{ opacity: 1, scale: 1, y: 0 }}
+        exit={{ opacity: 0, scale: 0.95, y: 20 }}
+        className="bg-white rounded-3xl shadow-2xl w-full max-w-md overflow-hidden relative"
+      >
+        <div className="p-6 border-b border-gray-100 flex items-center justify-between">
+          <h3 className="text-xl font-bold text-[#001828]">Edit Terminal</h3>
+          <button onClick={onClose} className="p-2 hover:bg-gray-100 rounded-full transition-colors">
+            <X size={20} className="text-gray-400" />
+          </button>
+        </div>
+
+        <div className="p-8">
+          <AnimatePresence mode="wait">
+            {step === 1 ? (
+              <motion.div
+                key="step1"
+                initial={{ opacity: 0, x: -20 }}
+                animate={{ opacity: 1, x: 0 }}
+                exit={{ opacity: 0, x: 20 }}
+                className="space-y-6"
+              >
+                <div className="space-y-2">
+                  <label className="text-sm font-semibold text-gray-700 flex items-center gap-2">
+                    <Monitor size={16} className="text-[#001828]" /> Terminal Name
+                  </label>
+                  <input 
+                    type="text"
+                    value={name}
+                    onChange={(e) => setName(e.target.value)}
+                    placeholder="e.g. Counter 1"
+                    className="w-full h-12 px-4 bg-gray-50 border border-gray-200 rounded-xl focus:ring-2 focus:ring-[#001828]/20 focus:border-[#001828] outline-none transition-all"
+                  />
+                </div>
+
+                <div className="space-y-2">
+                  <label className="text-sm font-semibold text-gray-700 flex items-center gap-2">
+                    <MapPin size={16} className="text-[#001828]" /> Location
+                  </label>
+                  <input 
+                    type="text"
+                    value={location}
+                    onChange={(e) => setLocation(e.target.value)}
+                    placeholder="e.g. Main Entrance"
+                    className="w-full h-12 px-4 bg-gray-50 border border-gray-200 rounded-xl focus:ring-2 focus:ring-[#001828]/20 focus:border-[#001828] outline-none transition-all"
+                  />
+                </div>
+
+                {/* Change PIN toggle */}
+                <label className="flex items-center gap-3 p-3 bg-gray-50 rounded-xl cursor-pointer hover:bg-gray-100 transition-colors">
+                  <input 
+                    type="checkbox" 
+                    checked={changePin} 
+                    onChange={(e) => setChangePin(e.target.checked)}
+                    className="w-4 h-4 rounded accent-[#001828]"
+                  />
+                  <div className="flex items-center gap-2 text-sm font-medium text-gray-700">
+                    <Lock size={14} className="text-[#001828]" />
+                    Change Security PIN
+                  </div>
+                </label>
+
+                {changePin ? (
+                  <button
+                    disabled={!name || !location}
+                    onClick={() => setStep(2)}
+                    className="w-full h-14 bg-[#001828] text-white rounded-2xl font-bold shadow-lg shadow-[#001828]/20 hover:scale-[1.02] active:scale-[0.98] transition-all disabled:opacity-50 disabled:scale-100"
+                  >
+                    Set New PIN
+                  </button>
+                ) : (
+                  <button
+                    disabled={!name || !location || loading}
+                    onClick={handleSubmit}
+                    className="w-full h-14 bg-[#001828] text-white rounded-2xl font-bold shadow-lg shadow-[#001828]/20 hover:scale-[1.02] active:scale-[0.98] transition-all disabled:opacity-50 disabled:scale-100"
+                  >
+                    {loading ? 'Saving...' : 'Save Changes'}
+                  </button>
+                )}
+              </motion.div>
+            ) : (
+              <motion.div
+                key="step2"
+                initial={{ opacity: 0, x: 20 }}
+                animate={{ opacity: 1, x: 0 }}
+                exit={{ opacity: 0, x: -20 }}
+                className="space-y-6"
+              >
+                <div className="text-center mb-4">
+                  <div className="inline-flex p-3 bg-purple-50 text-[#001828] rounded-2xl mb-3">
+                    <Lock size={24} />
+                  </div>
+                  <h4 className="text-lg font-bold text-gray-900">New Security PIN</h4>
+                  <p className="text-sm text-gray-500">Enter a new 4-digit security PIN</p>
+                </div>
+
+                <Numpad value={pin} onChange={setPin} maxLength={4} />
+
+                <div className="flex gap-3 pt-4">
+                  <button 
+                    onClick={() => setStep(1)}
+                    className="flex-1 h-14 bg-gray-100 text-gray-600 rounded-2xl font-bold hover:bg-gray-200 transition-all"
+                  >
+                    Back
+                  </button>
+                  <button
+                    disabled={pin.length < 4 || loading}
+                    onClick={handleSubmit}
+                    className="flex-[2] h-14 bg-[#001828] text-white rounded-2xl font-bold shadow-lg shadow-[#001828]/20 hover:scale-[1.02] active:scale-[0.98] transition-all disabled:opacity-50 disabled:scale-100"
+                  >
+                    {loading ? 'Saving...' : 'Save Changes'}
+                  </button>
+                </div>
+              </motion.div>
+            )}
+          </AnimatePresence>
+        </div>
+      </motion.div>
+    </div>
+  );
+};
+
+export default EditTerminalModal;
diff --git a/frontend/src/pages/Terminals.tsx b/frontend/src/pages/Terminals.tsx
index ac1a6fb7..d03a9c56 100644
--- a/frontend/src/pages/Terminals.tsx
+++ b/frontend/src/pages/Terminals.tsx
@@ -7,6 +7,7 @@ import {
   MapPin, 
   ShieldCheck, 
   Trash2, 
+  Pencil,
   Search,
   ExternalLink,
   Info,
@@ -20,6 +21,7 @@ import {
 import AddTerminalModal from '../components/AddTerminalModal.tsx';
 import PinVerificationModal from '../components/PinVerificationModal.tsx';
 import LinkDeviceModal from '../components/LinkDeviceModal.tsx';
+import EditTerminalModal from '../components/EditTerminalModal.tsx';
 
 interface Terminal {
   id: number;
@@ -38,6 +40,7 @@ const Terminals = () => {
   const [isAddModalOpen, setIsAddModalOpen] = useState(false);
   const [isPinModalOpen, setIsPinModalOpen] = useState(false);
   const [isLinkModalOpen, setIsLinkModalOpen] = useState(false);
+  const [isEditModalOpen, setIsEditModalOpen] = useState(false);
   const [selectedTerminal, setSelectedTerminal] = useState<Terminal | null>(null);
 
   const fetchTerminals = async () => {
@@ -59,26 +62,36 @@ const Terminals = () => {
     fetchTerminals();
   }, []);
 
-  const handleDelete = async (id: number, e: React.MouseEvent) => {
-    e.stopPropagation();
+  const handleDelete = async (id: number) => {
     if (window.confirm('Are you sure you want to remove this terminal?')) {
       try {
         const response = await apiFetch(`/api/terminals/${id}`, { method: 'DELETE' });
-        if (response.ok) fetchTerminals();
+        if (response.ok) {
+          fetchTerminals();
+        } else {
+          const data = await response.json().catch(() => ({}));
+          alert(data.message || `Failed to delete terminal (HTTP ${response.status})`);
+        }
       } catch (error) {
         console.error('Failed to delete terminal:', error);
+        alert('Network error: Could not delete terminal');
       }
     }
   };
 
-  const handleUnpair = async (id: number, e: React.MouseEvent) => {
-    e.stopPropagation();
+  const handleUnpair = async (id: number) => {
     if (window.confirm('Unpair this device? It will need to be re-paired on next boot.')) {
       try {
         const response = await apiFetch(`/api/terminals/${id}/unpair`, { method: 'POST' });
-        if (response.ok) fetchTerminals();
+        if (response.ok) {
+          fetchTerminals();
+        } else {
+          const data = await response.json().catch(() => ({}));
+          alert(data.message || `Failed to unpair device (HTTP ${response.status})`);
+        }
       } catch (error) {
         console.error('Failed to unpair device:', error);
+        alert('Network error: Could not unpair device');
       }
     }
   };
@@ -173,14 +186,10 @@ const Terminals = () => {
               layout
               key={terminal.id}
               whileHover={{ y: -5 }}
-              onClick={() => {
-                setSelectedTerminal(terminal);
-                setIsPinModalOpen(true);
-              }}
               className="bg-white p-6 rounded-[2.5rem] border border-gray-100 shadow-sm hover:shadow-xl hover:shadow-[#001828]/5 transition-all cursor-pointer group relative overflow-hidden"
             >
               {/* Card Background Pattern */}
-              <div className="absolute -right-8 -top-8 text-[#001828]/5 rotate-12 transition-transform group-hover:rotate-0 duration-500">
+              <div className="absolute -right-8 -top-8 text-[#001828]/5 rotate-12 transition-transform group-hover:rotate-0 duration-500 pointer-events-none">
                 <Monitor size={140} />
               </div>
 
@@ -193,10 +202,12 @@ const Terminals = () => {
                   }`}>
                     <Monitor size={28} />
                   </div>
-                  <div className="flex items-center gap-1">
+                  {/* Action buttons — completely separate from card click */}
+                  <div className="flex items-center gap-1 relative z-20">
                     {terminal.paired && (
                       <button
-                        onClick={(e) => handleUnpair(terminal.id, e)}
+                        type="button"
+                        onClick={(e) => { e.preventDefault(); e.stopPropagation(); handleUnpair(terminal.id); }}
                         title="Unpair device"
                         className="p-2 text-gray-400 hover:text-orange-500 hover:bg-orange-50 rounded-xl transition-all"
                       >
@@ -204,7 +215,17 @@ const Terminals = () => {
                       </button>
                     )}
                     <button
-                      onClick={(e) => handleDelete(terminal.id, e)}
+                      type="button"
+                      onClick={(e) => { e.preventDefault(); e.stopPropagation(); setSelectedTerminal(terminal); setIsEditModalOpen(true); }}
+                      title="Edit terminal"
+                      className="p-2 text-gray-400 hover:text-blue-500 hover:bg-blue-50 rounded-xl transition-all"
+                    >
+                      <Pencil size={16} />
+                    </button>
+                    <button
+                      type="button"
+                      onClick={(e) => { e.preventDefault(); e.stopPropagation(); handleDelete(terminal.id); }}
+                      title="Delete terminal"
                       className="p-2 text-gray-400 hover:text-red-500 hover:bg-red-50 rounded-xl transition-all"
                     >
                       <Trash2 size={18} />
@@ -212,56 +233,68 @@ const Terminals = () => {
                   </div>
                 </div>
 
-                <div>
-                  <h4 className="text-xl font-bold text-gray-900 group-hover:text-[#001828] transition-colors">{terminal.name}</h4>
-                  <div className="flex items-center gap-1.5 text-gray-500 mt-1 font-medium text-sm">
-                    <MapPin size={14} />
-                    <span>{terminal.location}</span>
+                {/* Clickable area for viewing API Key (opens PIN modal) */}
+                <div
+                  role="button"
+                  tabIndex={0}
+                  onClick={() => {
+                    setSelectedTerminal(terminal);
+                    setIsPinModalOpen(true);
+                  }}
+                  onKeyDown={(e) => { if (e.key === 'Enter') { setSelectedTerminal(terminal); setIsPinModalOpen(true); }}}
+                >
+                  <div>
+                    <h4 className="text-xl font-bold text-gray-900 group-hover:text-[#001828] transition-colors">{terminal.name}</h4>
+                    <div className="flex items-center gap-1.5 text-gray-500 mt-1 font-medium text-sm">
+                      <MapPin size={14} />
+                      <span>{terminal.location}</span>
+                    </div>
                   </div>
-                </div>
 
-                {/* Device ID for paired terminals */}
-                {terminal.paired && terminal.deviceId && (
-                  <div className="flex items-center gap-2 text-xs text-gray-400 font-mono bg-gray-50 px-3 py-1.5 rounded-lg w-fit">
-                    <Smartphone size={12} />
-                    <span>{terminal.deviceId}</span>
-                  </div>
-                )}
+                  {/* Device ID for paired terminals */}
+                  {terminal.paired && terminal.deviceId && (
+                    <div className="flex items-center gap-2 text-xs text-gray-400 font-mono bg-gray-50 px-3 py-1.5 rounded-lg w-fit mt-4">
+                      <Smartphone size={12} />
+                      <span>{terminal.deviceId}</span>
+                    </div>
+                  )}
 
-                <div className="pt-4 flex items-center justify-between border-t border-gray-50">
-                  <div className="flex items-center gap-2">
+                  <div className="pt-4 flex items-center justify-between border-t border-gray-50 mt-4">
+                    <div className="flex items-center gap-2">
+                      {terminal.paired ? (
+                        <>
+                          <div className="w-2 h-2 rounded-full bg-green-500 animate-pulse" />
+                          <span className="text-[12px] font-bold text-green-600 uppercase tracking-wider">Paired</span>
+                        </>
+                      ) : (
+                        <>
+                          <div className="w-2 h-2 rounded-full bg-gray-300" />
+                          <span className="text-[12px] font-bold text-gray-400 uppercase tracking-wider">Unpaired</span>
+                        </>
+                      )}
+                    </div>
+                    
                     {terminal.paired ? (
-                      <>
-                        <div className="w-2 h-2 rounded-full bg-green-500 animate-pulse" />
-                        <span className="text-[12px] font-bold text-green-600 uppercase tracking-wider">Paired</span>
-                      </>
+                      <div className="flex items-center gap-2 text-[#001828] font-bold text-sm">
+                        <Key size={16} />
+                        <span>View API Key</span>
+                        <ExternalLink size={14} />
+                      </div>
                     ) : (
-                      <>
-                        <div className="w-2 h-2 rounded-full bg-gray-300" />
-                        <span className="text-[12px] font-bold text-gray-400 uppercase tracking-wider">Unpaired</span>
-                      </>
+                      <button
+                        type="button"
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          setSelectedTerminal(terminal);
+                          setIsLinkModalOpen(true);
+                        }}
+                        className="flex items-center gap-2 text-indigo-600 font-bold text-sm hover:text-indigo-700 transition-colors bg-indigo-50 px-3 py-1.5 rounded-xl hover:bg-indigo-100"
+                      >
+                        <LinkIcon size={14} />
+                        <span>Link Device</span>
+                      </button>
                     )}
                   </div>
-                  
-                  {terminal.paired ? (
-                    <div className="flex items-center gap-2 text-[#001828] font-bold text-sm">
-                      <Key size={16} />
-                      <span>View API Key</span>
-                      <ExternalLink size={14} />
-                    </div>
-                  ) : (
-                    <button
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        setSelectedTerminal(terminal);
-                        setIsLinkModalOpen(true);
-                      }}
-                      className="flex items-center gap-2 text-indigo-600 font-bold text-sm hover:text-indigo-700 transition-colors bg-indigo-50 px-3 py-1.5 rounded-xl hover:bg-indigo-100"
-                    >
-                      <LinkIcon size={14} />
-                      <span>Link Device</span>
-                    </button>
-                  )}
                 </div>
               </div>
             </motion.div>
@@ -311,6 +344,18 @@ const Terminals = () => {
         terminalName={selectedTerminal?.name || ''}
       />
 
+      <EditTerminalModal
+        isOpen={isEditModalOpen}
+        onClose={() => {
+          setIsEditModalOpen(false);
+          setSelectedTerminal(null);
+        }}
+        onSuccess={fetchTerminals}
+        terminalId={selectedTerminal?.id || null}
+        initialName={selectedTerminal?.name || ''}
+        initialLocation={selectedTerminal?.location || ''}
+      />
+
       <style dangerouslySetInnerHTML={{ __html: `
         @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap');
         .font-inter { font-family: 'Inter', sans-serif; }