diff --git a/setup.sh b/setup.sh
index 301f1ac..be4359f 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1679,7 +1679,7 @@ cat <<'HTML_END' > templates/index.html
             <tr>
                 <th>{{ _('Cover') }}</th>
                 <th>{{ _('Name') }}</th>
-                <th class="key-col d-md-table-cell">{{ _('Key') }}</th>
+                <th class="key-col">{{ _('Key') }}</th>
                 <th>{{ _('Status') }}</th>
                 <th>{{ _('Created') }}</th>
                 <th>{{ _('Redeem by') }}</th>
@@ -1712,7 +1712,7 @@ cat <<'HTML_END' > templates/index.html
                   </a>
                 </td>
                 <td>{{ game.name }}</td>
-                <td class="font-monospace key-col d-none d-md-table-cell">{{ game.steam_key }}</td>
+                <td class="font-monospace key-col">{{ game.steam_key }}</td>
                 <td>
                     {% if game.status == 'nicht eingelöst' %}
                         <span class="badge bg-warning text-dark">{{ _('Not redeemed') }}</span>
@@ -1840,22 +1840,34 @@ document.querySelectorAll('.generate-redeem').forEach(btn => {
 </script>
 <script>
 document.addEventListener('DOMContentLoaded', function() {
-  console.log("DOM ist geladen!"); // Überprüfe, ob DOMContentLoaded überhaupt ausgeführt wird
-  const toggleKeysButton = document.getElementById('toggle-keys');
-  if (toggleKeysButton) {
-    console.log("Button with ID 'toggle-keys' found!");
-    toggleKeysButton.addEventListener('click', function() {
-      console.log("Button clicked!");
-      const keyCols = document.querySelectorAll('.key-col');
-      keyCols.forEach(function(el) {
-        el.classList.toggle('hidden');
-      });
+  const KEY_STORAGE = 'showKeys';
+  const toggleBtn = document.getElementById('toggle-keys');
+
+  function toggleKeys(visible) {
+    document.querySelectorAll('.key-col').forEach(el => {
+      visible ? el.classList.remove('d-none') : el.classList.add('d-none');
+    });
+  }
+
+  const savedState = localStorage.getItem(KEY_STORAGE);
+  const initialVisibility = savedState ? JSON.parse(savedState) : true;
+  toggleKeys(initialVisibility);
+
+  if (toggleBtn) {
+    let isVisible = initialVisibility;
+    
+    toggleBtn.addEventListener('click', () => {
+      isVisible = !isVisible;
+      toggleKeys(isVisible);
+      localStorage.setItem(KEY_STORAGE, JSON.stringify(isVisible));
+      
+      console.log(`Keys sind jetzt: ${isVisible ? 'sichtbar' : 'versteckt'}`);
+      console.log(`LocalStorage-Wert: ${localStorage.getItem(KEY_STORAGE)}`);
     });
-  } else {
-    console.log("Button with ID 'toggle-keys' not found!");
   }
 });
 </script>
+
 {% else %}
 <div class="alert alert-info">{{ _('No games yet') }}</div>
 {% endif %}
@@ -2100,7 +2112,7 @@ cat <<HTML_END > templates/edit_game.html
         <label for="game_notes" class="form-label">{{ _('Notes') }}</label>
         <textarea id="game_notes" name="notes" class="form-control" rows="3">{{ game.notes }}</textarea>
       </div>
-
+      
       <!-- Show External Data -->
       <div class="col-12">
         <div class="card mb-4">
diff --git a/steam-gift-manager/templates/index.html b/steam-gift-manager/templates/index.html
index faa450e..9249ac2 100644
--- a/steam-gift-manager/templates/index.html
+++ b/steam-gift-manager/templates/index.html
@@ -8,7 +8,7 @@
             <tr>
                 <th>{{ _('Cover') }}</th>
                 <th>{{ _('Name') }}</th>
-                <th class="key-col d-md-table-cell">{{ _('Key') }}</th>
+                <th class="key-col">{{ _('Key') }}</th>
                 <th>{{ _('Status') }}</th>
                 <th>{{ _('Created') }}</th>
                 <th>{{ _('Redeem by') }}</th>
@@ -41,7 +41,7 @@
                   </a>
                 </td>
                 <td>{{ game.name }}</td>
-                <td class="font-monospace key-col d-none d-md-table-cell">{{ game.steam_key }}</td>
+                <td class="font-monospace key-col">{{ game.steam_key }}</td>
                 <td>
                     {% if game.status == 'nicht eingelöst' %}
                         <span class="badge bg-warning text-dark">{{ _('Not redeemed') }}</span>
@@ -169,19 +169,30 @@ document.querySelectorAll('.generate-redeem').forEach(btn => {
 </script>
 <script>
 document.addEventListener('DOMContentLoaded', function() {
-  console.log("DOM ist geladen!"); // Überprüfe, ob DOMContentLoaded überhaupt ausgeführt wird
-  const toggleKeysButton = document.getElementById('toggle-keys');
-  if (toggleKeysButton) {
-    console.log("Button with ID 'toggle-keys' found!");
-    toggleKeysButton.addEventListener('click', function() {
-      console.log("Button clicked!");
-      const keyCols = document.querySelectorAll('.key-col');
-      keyCols.forEach(function(el) {
-        el.classList.toggle('hidden');
-      });
+  const KEY_STORAGE = 'showKeys';
+  const toggleBtn = document.getElementById('toggle-keys');
+
+  function toggleKeys(visible) {
+    document.querySelectorAll('.key-col').forEach(el => {
+      visible ? el.classList.remove('d-none') : el.classList.add('d-none');
+    });
+  }
+
+  const savedState = localStorage.getItem(KEY_STORAGE);
+  const initialVisibility = savedState ? JSON.parse(savedState) : true;
+  toggleKeys(initialVisibility);
+
+  if (toggleBtn) {
+    let isVisible = initialVisibility;
+    
+    toggleBtn.addEventListener('click', () => {
+      isVisible = !isVisible;
+      toggleKeys(isVisible);
+      localStorage.setItem(KEY_STORAGE, JSON.stringify(isVisible));
+      
+      console.log(`Keys sind jetzt: ${isVisible ? 'sichtbar' : 'versteckt'}`);
+      console.log(`LocalStorage-Wert: ${localStorage.getItem(KEY_STORAGE)}`);
     });
-  } else {
-    console.log("Button with ID 'toggle-keys' not found!");
   }
 });
 </script>
@@ -189,4 +200,3 @@ document.addEventListener('DOMContentLoaded', function() {
 <div class="alert alert-info">{{ _('No games yet') }}</div>
 {% endif %}
 {% endblock %}
-