diff --git a/gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts b/gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts
index fb2044549..ca541008d 100644
--- a/gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts
+++ b/gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts
@@ -1235,12 +1235,11 @@ export class CommandsManager {
   static async applyPreferences() {
     const {
       enableMultipleEquityColumns,
-      godleyTableShowValues,
       godleyTableOutputStyle,
       font,
       numBackups,
     } = StoreManager.store.get('preferences');
-    minsky.setGodleyDisplayValue(godleyTableShowValues,godleyTableOutputStyle);
+    minsky.displayStyle(godleyTableOutputStyle);
     minsky.multipleEquities(enableMultipleEquityColumns);
     minsky.defaultFont(font);
     minsky.numBackups(numBackups);
diff --git a/gui-js/apps/minsky-electron/src/app/managers/ContextMenuManager.ts b/gui-js/apps/minsky-electron/src/app/managers/ContextMenuManager.ts
index 1444cc0df..8750ed666 100644
--- a/gui-js/apps/minsky-electron/src/app/managers/ContextMenuManager.ts
+++ b/gui-js/apps/minsky-electron/src/app/managers/ContextMenuManager.ts
@@ -682,7 +682,19 @@ export class ContextMenuManager {
         label: 'Display variables',
         type: 'checkbox',
         checked: displayVariableChecked,
-        click: () => godley.toggleVariableDisplay()
+        click: async () => {
+          await godley.toggleVariableDisplay();
+          await minsky.canvas.requestRedraw();
+        }
+      }),
+      new MenuItem({
+        label: 'Display values',
+        type: 'checkbox',
+        checked: await godley.displayValues(),
+        click: async () => {
+          await godley.toggleDisplayValues();
+          await minsky.canvas.requestRedraw();
+        },
       }),
       new MenuItem({
         label: 'Copy flow variables',
diff --git a/gui-js/apps/minsky-electron/src/app/managers/GodleyMenuManager.ts b/gui-js/apps/minsky-electron/src/app/managers/GodleyMenuManager.ts
index 732d6b944..c837ce598 100644
--- a/gui-js/apps/minsky-electron/src/app/managers/GodleyMenuManager.ts
+++ b/gui-js/apps/minsky-electron/src/app/managers/GodleyMenuManager.ts
@@ -58,7 +58,6 @@ export class GodleyMenuManager {
     const preferences = StoreManager.store.get('preferences');
     let {
       enableMultipleEquityColumns,
-      godleyTableShowValues,
       godleyTableOutputStyle,
     } = preferences;
 
@@ -66,19 +65,14 @@ export class GodleyMenuManager {
       enableMultipleEquityColumns = value as boolean;
       minsky.multipleEquities(enableMultipleEquityColumns);
       GodleyMenuManager.refresh(window);
-    } else {
-      if (property === 'godleyTableOutputStyle') {
+    } else if (property === 'godleyTableOutputStyle') {
         godleyTableOutputStyle = value as GodleyTableOutputStyles;
-      } else if (property === 'godleyTableShowValues') {
-        godleyTableShowValues = value as boolean;
-      }
-      minsky.setGodleyDisplayValue(godleyTableShowValues, godleyTableOutputStyle);
+        minsky.displayStyle(godleyTableOutputStyle);
     }
 
     StoreManager.store.set({
       preferences: {
         ...preferences,
-        godleyTableShowValues: godleyTableShowValues,
         godleyTableOutputStyle: godleyTableOutputStyle,
         enableMultipleEquityColumns: enableMultipleEquityColumns,
       },
diff --git a/gui-js/apps/minsky-electron/src/app/managers/StoreManager.ts b/gui-js/apps/minsky-electron/src/app/managers/StoreManager.ts
index ddcc18df3..f3aa3baec 100644
--- a/gui-js/apps/minsky-electron/src/app/managers/StoreManager.ts
+++ b/gui-js/apps/minsky-electron/src/app/managers/StoreManager.ts
@@ -3,7 +3,6 @@ import Store from 'electron-store';
 import {homedir} from 'node:os';
 
 interface MinskyPreferences {
-  godleyTableShowValues: boolean;
   godleyTableOutputStyle: string;
   enableMultipleEquityColumns: boolean;
   numberOfRecentFilesToDisplay: number;
@@ -31,7 +30,6 @@ class StoreManager {
       defaultModelDirectory: homedir(),
       defaultDataDirectory: homedir(),
       preferences: {
-        godleyTableShowValues: false,
         godleyTableOutputStyle: 'sign',
         enableMultipleEquityColumns: false,
         numberOfRecentFilesToDisplay: 10,
diff --git a/gui-js/libs/menu/src/lib/options/preferences/preferences.component.html b/gui-js/libs/menu/src/lib/options/preferences/preferences.component.html
index 0474daaee..42d75235e 100644
--- a/gui-js/libs/menu/src/lib/options/preferences/preferences.component.html
+++ b/gui-js/libs/menu/src/lib/options/preferences/preferences.component.html
@@ -3,17 +3,6 @@
 
   <div class="form-wrapper">
     <form [formGroup]="form">
-      <div class="form-control">
-        <label for="godleyTableShowValues">Godley Table Show Values</label>
-        <input
-          formControlName="godleyTableShowValues"
-          type="checkbox"
-          class="godley-table-show-values-checkbox"
-          id="godleyTableShowValues"
-          (change)="updatePreferences()"
-          />
-      </div>
-
       <div class="form-control">
         <label>Godley Table Output Style</label>
         <span class="radio-wrapper">
diff --git a/gui-js/libs/menu/src/lib/options/preferences/preferences.component.ts b/gui-js/libs/menu/src/lib/options/preferences/preferences.component.ts
index 73eb1fbf7..a47038ab9 100644
--- a/gui-js/libs/menu/src/lib/options/preferences/preferences.component.ts
+++ b/gui-js/libs/menu/src/lib/options/preferences/preferences.component.ts
@@ -22,7 +22,6 @@ export class PreferencesComponent implements OnInit {
 
   constructor(private electronService: ElectronService) {
     this.form = new FormGroup({
-      godleyTableShowValues: new FormControl(null),
       godleyTableOutputStyle: new FormControl(null),
       enableMultipleEquityColumns: new FormControl(null),
       numberOfRecentFilesToDisplay: new FormControl(null),
diff --git a/gui-js/libs/shared/src/lib/backend/minsky.ts b/gui-js/libs/shared/src/lib/backend/minsky.ts
index 3eb3d7e06..3eece4cde 100644
--- a/gui-js/libs/shared/src/lib/backend/minsky.ts
+++ b/gui-js/libs/shared/src/lib/backend/minsky.ts
@@ -743,6 +743,7 @@ export class GodleyIcon extends Item {
   async currency(...args: string[]): Promise<string> {return this.$callMethod('currency',...args);}
   async deleteRow(a1: number): Promise<void> {return this.$callMethod('deleteRow',a1);}
   async destroyFrame(): Promise<void> {return this.$callMethod('destroyFrame');}
+  async displayValues(...args: boolean[]): Promise<boolean> {return this.$callMethod('displayValues',...args);}
   async draw(a1: ICairoShim): Promise<void> {return this.$callMethod('draw',a1);}
   async editorMode(): Promise<boolean> {return this.$callMethod('editorMode');}
   async flowSignature(a1: number): Promise<object> {return this.$callMethod('flowSignature',a1);}
@@ -771,6 +772,7 @@ export class GodleyIcon extends Item {
   async toEditorX(a1: number): Promise<number> {return this.$callMethod('toEditorX',a1);}
   async toEditorY(a1: number): Promise<number> {return this.$callMethod('toEditorY',a1);}
   async toggleButtons(): Promise<void> {return this.$callMethod('toggleButtons');}
+  async toggleDisplayValues(): Promise<void> {return this.$callMethod('toggleDisplayValues');}
   async toggleEditorMode(): Promise<void> {return this.$callMethod('toggleEditorMode');}
   async toggleVariableDisplay(): Promise<void> {return this.$callMethod('toggleVariableDisplay');}
   async update(): Promise<void> {return this.$callMethod('update');}
@@ -1368,7 +1370,6 @@ export class Minsky extends CppClass {
   async dimensionalAnalysis(): Promise<void> {return this.$callMethod('dimensionalAnalysis');}
   async displayErrorItem(a1: Item): Promise<void> {return this.$callMethod('displayErrorItem',a1);}
   async displayStyle(...args: string[]): Promise<string> {return this.$callMethod('displayStyle',...args);}
-  async displayValues(...args: boolean[]): Promise<boolean> {return this.$callMethod('displayValues',...args);}
   async doPushHistory(...args: boolean[]): Promise<boolean> {return this.$callMethod('doPushHistory',...args);}
   async ecolabVersion(): Promise<string> {return this.$callMethod('ecolabVersion');}
   async edited(): Promise<boolean> {return this.$callMethod('edited');}
@@ -1454,7 +1455,6 @@ export class Minsky extends CppClass {
   async setAutoSaveFile(a1: string): Promise<void> {return this.$callMethod('setAutoSaveFile',a1);}
   async setBusyCursor(): Promise<void> {return this.$callMethod('setBusyCursor');}
   async setDefinition(a1: string,a2: string): Promise<void> {return this.$callMethod('setDefinition',a1,a2);}
-  async setGodleyDisplayValue(a1: boolean,a2: string): Promise<void> {return this.$callMethod('setGodleyDisplayValue',a1,a2);}
   async setGodleyIconResource(a1: string): Promise<void> {return this.$callMethod('setGodleyIconResource',a1);}
   async setGroupIconResource(a1: string): Promise<void> {return this.$callMethod('setGroupIconResource',a1);}
   async setLockIconResource(a1: string,a2: string): Promise<void> {return this.$callMethod('setLockIconResource',a1,a2);}
diff --git a/model/godleyIcon.h b/model/godleyIcon.h
index dc8d7c761..69e52604a 100644
--- a/model/godleyIcon.h
+++ b/model/godleyIcon.h
@@ -82,8 +82,13 @@ namespace minsky
     GodleyTableEditor editor{*this};
     /// for rendering the popup window
     GodleyTableWindow popup{*this};
-    void adjustPopupWidgets() {popup.adjustWidgets();}
+
+    /// whether to display values in this table
+    bool displayValues=false;
+    void toggleDisplayValues() {displayValues=!displayValues;}
     
+    void adjustPopupWidgets() {popup.adjustWidgets();}
+
     /// scale icon until it's height or width matches \a h or \a w depending on which is minimum             
     void scaleIcon(float w, float h);         
     
diff --git a/model/godleyTableWindow.cc b/model/godleyTableWindow.cc
index 84274bd72..f726ede34 100644
--- a/model/godleyTableWindow.cc
+++ b/model/godleyTableWindow.cc
@@ -233,7 +233,7 @@ namespace minsky
                   {
                     string value;
                     FlowCoef fc(text);
-                    if (cminsky().displayValues && col!=0)  // Do not add value "= 0.0" to first column. For tickets 1064/1274
+                    if (m_godleyIcon.displayValues && col!=0)  // Do not add value "= 0.0" to first column. For tickets 1064/1274
                       try
                         {
                           auto vv=cminsky().variableValues
@@ -280,7 +280,7 @@ namespace minsky
                       }
                     else
                       //Display values of parameters used as initial conditions in Godley tables. for ticket 1126.  
-                      if (m_godleyIcon.table.initialConditionRow(row) && cminsky().displayValues) text=defang(text+=value);
+                      if (m_godleyIcon.table.initialConditionRow(row) && m_godleyIcon.displayValues) text=defang(text+=value);
                       else text=defang(text);
                   }
                 pango.setMarkup(text);
diff --git a/model/godleyTableWindow.h b/model/godleyTableWindow.h
index caf0367de..388dcf960 100644
--- a/model/godleyTableWindow.h
+++ b/model/godleyTableWindow.h
@@ -94,6 +94,9 @@ namespace minsky
     /// minimum column width (for eg empty columns)
     static constexpr double minColumnWidth=4*ButtonWidget<col>::buttonSpacing;
 
+    // note explicit getter/setter here rather than public member to
+    // avoid an infinite recursion when running RESTProcess on this
+    // object
     GodleyIcon& godleyIcon() {return m_godleyIcon;}
     const GodleyIcon& godleyIcon() const {return m_godleyIcon;}
     
diff --git a/model/minsky.cc b/model/minsky.cc
index 76afc2e3b..c101c7ee2 100644
--- a/model/minsky.cc
+++ b/model/minsky.cc
@@ -1597,18 +1597,6 @@ namespace minsky
     });
   }
 
-  void Minsky::setGodleyDisplayValue(bool displayValues, GodleyTable::DisplayStyle displayStyle)
-  {
-    this->displayValues=displayValues;
-    this->displayStyle=displayStyle;
-    canvas.requestRedraw();
-    model->recursiveDo(&GroupItems::items, [](Items&,Items::iterator i) {
-      if (auto g=dynamic_cast<GodleyIcon*>(i->get()))
-        g->popup.requestRedraw();
-      return false;
-    });
-  }
-
   void Minsky::importVensim(const string& filename)
   {
     ifstream f(filename);
diff --git a/model/minsky.h b/model/minsky.h
index af2bb0f01..e1c3cd97a 100644
--- a/model/minsky.h
+++ b/model/minsky.h
@@ -424,12 +424,8 @@ namespace minsky
     void srand(int seed) {::srand(seed);}
 
     // godley table display values preferences
-    bool displayValues=false;
     GodleyTable::DisplayStyle displayStyle=GodleyTable::sign;
 
-    /// set display value mode on all godley table editor modes
-    void setGodleyDisplayValue(bool displayValues, GodleyTable::DisplayStyle displayStyle);
-
     /// import a Vensim file
     void importVensim(const std::string&);
     
diff --git a/schema/schema3.cc b/schema/schema3.cc
index f3dc0660d..669d85129 100644
--- a/schema/schema3.cc
+++ b/schema/schema3.cc
@@ -577,6 +577,8 @@ namespace schema3
           SchemaHelper::setVariableDisplay(*x1, *y.variableDisplay);
         if (y.buttonDisplay && *y.buttonDisplay!=x1->buttonDisplay())
           x1->toggleButtons();
+        if (y.displayValues && *y.displayValues!=x1->displayValues)
+          x1->toggleDisplayValues();
         if (y.currency) x1->currency=*y.currency;
       }
     if (auto* x1=dynamic_cast<minsky::PlotWidget*>(&x))
diff --git a/schema/schema3.h b/schema/schema3.h
index be988b6e3..dcfd2eaaa 100644
--- a/schema/schema3.h
+++ b/schema/schema3.h
@@ -125,7 +125,7 @@ namespace schema3
     // Godley Icon specific fields
     Optional<std::vector<std::vector<std::string>>> data;
     Optional<std::vector<minsky::GodleyAssetClass::AssetClass>> assetClasses;
-    Optional<bool> editorMode, buttonDisplay, variableDisplay;
+    Optional<bool> editorMode, buttonDisplay, variableDisplay, displayValues;
     Optional<string> currency;
     // sheet specific fields
     Optional<minsky::ShowSlice> showSlice; // slicing rows
@@ -160,7 +160,8 @@ namespace schema3
       ItemBase(id,static_cast<const minsky::Item&>(g),ports),
       data(g.table.getData()), assetClasses(g.table.assetClass()),
       editorMode(g.editorMode()), buttonDisplay(g.buttonDisplay()),
-      variableDisplay(g.variableDisplay()), currency(g.currency)
+      variableDisplay(g.variableDisplay()), displayValues(g.displayValues),
+      currency(g.currency)
     {name=g.table.title;}
     Item(int id, const minsky::PlotWidget& p, const std::vector<int>& ports):
       ItemBase(id,static_cast<const minsky::Item&>(p),ports),
diff --git a/test/00/godleyTableWindow.sh b/test/00/godleyTableWindow.sh
index caf70f922..f47f644a0 100755
--- a/test/00/godleyTableWindow.sh
+++ b/test/00/godleyTableWindow.sh
@@ -10,8 +10,8 @@ minsky.defaultFont('Sans')
 minsky.load('$here/examples/1Free.mky')
 minsky.multipleEquities(True)
 minsky.displayStyle('sign')
-minsky.displayValues(True)
 item=findObject('GodleyIcon')
+item.displayValues(True)
 gw=item.popup
 gw.enableButtons()
 gw.renderToSVG('1FreeBase.svg')
@@ -34,7 +34,7 @@ gw.renderToSVG('1FreeSelectedCol.svg')
 minsky.load('$here/examples/LoanableFunds.mky')
 item=findObject('GodleyIcon')
 minsky.displayStyle('DRCR')
-minsky.displayValues(0)
+item.displayValues(False)
 item.popup.enableButtons()
 item.popup.renderToSVG('LoanableFundsBase.svg')
 EOF
diff --git a/test/testMinsky.cc b/test/testMinsky.cc
index d8b0430a8..5e8aa0551 100644
--- a/test/testMinsky.cc
+++ b/test/testMinsky.cc
@@ -1628,21 +1628,6 @@ TEST(TensorOps, evalOpEvaluate)
       EXPECT_TRUE(variableValues[":unitVar"]->units.str().empty());
     }
 
-    // Test setGodleyDisplayValue
-    TEST_F(MinskySuite, setGodleyDisplayValue)
-    {
-      auto g1 = new GodleyIcon;
-      model->addItem(g1);
-      
-      setGodleyDisplayValue(true, GodleyTable::DRCR);
-      EXPECT_TRUE(displayValues);
-      EXPECT_EQ(GodleyTable::DRCR, displayStyle);
-      
-      setGodleyDisplayValue(false, GodleyTable::sign);
-      EXPECT_FALSE(displayValues);
-      EXPECT_EQ(GodleyTable::sign, displayStyle);
-    }
-
     // Test save and load
     TEST_F(MinskySuite, saveAndLoad)
     {