diff --git a/Savage Worlds - Graph Paper/SavageWorldsGraphPaper.html b/Savage Worlds - Graph Paper/SavageWorldsGraphPaper.html
index f5f25b270f..8dcccb44f1 100644
--- a/Savage Worlds - Graph Paper/SavageWorldsGraphPaper.html	
+++ b/Savage Worlds - Graph Paper/SavageWorldsGraphPaper.html	
@@ -28,6 +28,29 @@ on("sheet:opened", (e) => {
         TETRA.updateTraitRoll(trait);
       });
 
+      function updateListSkills(values) {
+        values = Object.entries(values);
+
+        let references = [],
+            updates = {};
+
+        _.each(values, (item) => {
+          references.push(item[0].replace('skill_name', 'skill_mod'));
+        });
+
+        getAttrs(references, (values) => {
+          _.each(references, (item) => {
+            let code = values[item].replace('_mod', '_code');
+
+            setAttrs({ [item.replace('skill_mod', 'skill_code')]: code }, { silent: true });
+          });
+        });
+      }
+
+      TETRA.doWithRepList('engrams', ['skill_name'], (v) => { updateListSkills(v) });
+      TETRA.doWithRepList('powers', ['skill_name'], (v) => { updateListSkills(v) });
+      TETRA.doWithRepList('weapons', ['skill_name'], (v) => { updateListSkills(v) });
+
       setAttrs({ ['sheet_update']: '1' });
     }
   });
diff --git a/Savage Worlds - Graph Paper/source/scripts/workers.js b/Savage Worlds - Graph Paper/source/scripts/workers.js
index 97ea9f657b..2f00279b9b 100644
--- a/Savage Worlds - Graph Paper/source/scripts/workers.js	
+++ b/Savage Worlds - Graph Paper/source/scripts/workers.js	
@@ -27,6 +27,29 @@ on("sheet:opened", (e) => {
         TETRA.updateTraitRoll(trait);
       });
 
+      function updateListSkills(values) {
+        values = Object.entries(values);
+
+        let references = [],
+            updates = {};
+
+        _.each(values, (item) => {
+          references.push(item[0].replace('skill_name', 'skill_mod'));
+        });
+
+        getAttrs(references, (values) => {
+          _.each(references, (item) => {
+            let code = values[item].replace('_mod', '_code');
+
+            setAttrs({ [item.replace('skill_mod', 'skill_code')]: code }, { silent: true });
+          });
+        });
+      }
+
+      TETRA.doWithRepList('engrams', ['skill_name'], (v) => { updateListSkills(v) });
+      TETRA.doWithRepList('powers', ['skill_name'], (v) => { updateListSkills(v) });
+      TETRA.doWithRepList('weapons', ['skill_name'], (v) => { updateListSkills(v) });
+
       setAttrs({ ['sheet_update']: '1' });
     }
   });