diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp
index c7ad892f4..90846715c 100644
--- a/Source/Glide64/Main.cpp
+++ b/Source/Glide64/Main.cpp
@@ -1565,7 +1565,7 @@ void newSwapBuffers()
         }
     }
 
-    if (g_settings->wireframe || g_settings->buff_clear() || (g_settings->hacks(CSettings::hack_PPL) && g_settings->ucode() == CSettings::ucode_S2DEX))
+    if (g_settings->wireframe() || g_settings->buff_clear() || (g_settings->hacks(CSettings::hack_PPL) && g_settings->ucode() == CSettings::ucode_S2DEX))
     {
         grDepthMask((g_settings->hacks(CSettings::hack_RE2) && g_settings->fb_depth_render_enabled()) ? FXFALSE : FXTRUE);
         grBufferClear(0, 0, 0xFFFF);
diff --git a/Source/Glide64/Settings.cpp b/Source/Glide64/Settings.cpp
index 357c1a1da..abdc2d6b9 100644
--- a/Source/Glide64/Settings.cpp
+++ b/Source/Glide64/Settings.cpp
@@ -56,7 +56,7 @@ CSettings::CSettings() :
     m_autodetect_ucode(true),
     m_ucode(ucode_Fast3D),
     m_unk_as_red(false),
-wireframe(0),
+    m_wireframe(false),
 wfmode(0),
 
 // Special fixes
@@ -130,7 +130,7 @@ void CSettings::RegisterSettings(void)
     general_setting(Set_wrpAnisotropic, "wrpAnisotropic", 0);
     general_setting(Set_autodetect_ucode, "autodetect_ucode", true);
     general_setting(Set_ucode, "ucode", ucode_F3DEX2);
-    general_setting(Set_wireframe, "wireframe", 0);
+    general_setting(Set_wireframe, "wireframe", false);
     general_setting(Set_wfmode, "wfmode", 1);
     general_setting(Set_unk_as_red, "unk_as_red", false);
     general_setting(Set_ghq_fltr, "ghq_fltr", TextureFilter_None);
@@ -552,11 +552,10 @@ void CSettings::ReadSettings()
 
     m_autodetect_ucode = GetSetting(Set_autodetect_ucode) != 0;
     m_unk_as_red = GetSetting(Set_unk_as_red) != 0;
+    m_wireframe = GetSetting(Set_wireframe) != 0;
 #ifndef _ENDUSER_RELEASE_
-    this->wireframe = GetSetting(Set_wireframe);
     this->wfmode = GetSetting(Set_wfmode);
 #else
-    this->wireframe = FALSE;
     this->wfmode = 0;
 #endif
     m_ucode = ucode_F3DEX2;
@@ -826,10 +825,10 @@ void CSettings::WriteSettings(void)
     SetSetting(Set_wrpAnisotropic, g_settings->wrpAnisotropic);
     SetSetting(Set_autodetect_ucode, m_autodetect_ucode);
 
+    SetSetting(Set_wireframe, m_wireframe);
     SetSetting(Set_unk_as_red, m_unk_as_red);
 #ifndef _ENDUSER_RELEASE_
     SetSetting(Set_ucode, (int)g_settings->ucode);
-    SetSetting(Set_wireframe, g_settings->wireframe);
     SetSetting(Set_wfmode, g_settings->wfmode);
 #endif //_ENDUSER_RELEASE_
 
diff --git a/Source/Glide64/Settings.h b/Source/Glide64/Settings.h
index 7cc151352..445698995 100644
--- a/Source/Glide64/Settings.h
+++ b/Source/Glide64/Settings.h
@@ -225,7 +225,7 @@ public:
     inline bool autodetect_ucode(void) const { return m_autodetect_ucode; }
     inline ucode_t ucode(void) const { return m_ucode; }
     inline bool unk_as_red(void) const { return m_unk_as_red; }
-    int wireframe;
+    inline bool wireframe(void) const { return m_wireframe; }
     int wfmode;
 
     // Special fixes
@@ -347,6 +347,7 @@ private:
     bool m_ghq_hirs_dump;
     bool m_autodetect_ucode;
     bool m_unk_as_red;
+    bool m_wireframe;
     ucode_t m_ucode;
     StippleMode_t m_stipple_mode;
     hacks_t m_hacks;
diff --git a/Source/Glide64/Util.cpp b/Source/Glide64/Util.cpp
index 9cca4cf63..641daf2f7 100644
--- a/Source/Glide64/Util.cpp
+++ b/Source/Glide64/Util.cpp
@@ -1576,7 +1576,7 @@ static void render_tri(uint16_t linew, int old_interpolate)
 
     cmb.cmb_ext_use = cmb.tex_cmb_ext_use = 0;
 
-    if (g_settings->wireframe)
+    if (g_settings->wireframe())
     {
         SetWireframeCol();
         for (i = 0; i < n; i++)
diff --git a/Source/Glide64/rdp.cpp b/Source/Glide64/rdp.cpp
index 2b6968b1c..aaf58ccf3 100644
--- a/Source/Glide64/rdp.cpp
+++ b/Source/Glide64/rdp.cpp
@@ -1411,7 +1411,7 @@ static void rdp_texrect()
 
     ConvertCoordsConvert(vptr, n_vertices);
 
-    if (g_settings->wireframe)
+    if (g_settings->wireframe())
     {
         SetWireframeCol();
         grDrawLine(&vstd[0], &vstd[2]);
@@ -2389,7 +2389,7 @@ static void rdp_fillrect()
         }
     }
 
-    if (g_settings->wireframe)
+    if (g_settings->wireframe())
     {
         SetWireframeCol();
         grDrawLine(&v[0], &v[2]);