diff --git a/common/build_version.cpp b/common/build_version.cpp
index a68d4ee971..fafae3117a 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -55,7 +55,11 @@ wxString GetPlatformGetBitnessName()
 {
     wxPlatformInfo platform;
 // TODO (ISM): Read conditional once our wx fork and flatpaks are running released 3.1.5
-#if 0 && wxCHECK_VERSION( 3, 1, 5 )
+// On Windows, use GetBitnessName if exists
+// I (J-PC) hope 3.1.6 has no problem
+#if defined( __WINDOWS__ ) && wxCHECK_VERSION( 3, 1, 5 )
+    return platform.GetBitnessName();
+#elif wxCHECK_VERSION( 3, 1, 6 )
     return platform.GetBitnessName();
 #else
     return platform.GetArchName();
diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp
index 0f2dcfe448..ae1ad9842c 100644
--- a/common/dialog_about/AboutDialog_main.cpp
+++ b/common/dialog_about/AboutDialog_main.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2010 Rafael Sokolowski <Rafael.Sokolowski@web.de>
- * Copyright (C) 2010-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2010-2022 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -102,18 +102,11 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     wxPlatformInfo platformInfo;
 
     libVersion << "Platform: " << wxGetOsDescription() << ", "
-// TODO (ISM): Readd conditional once our wx fork and flatpaks are running released 3.1.5
-#if 0 && wxCHECK_VERSION( 3, 1, 5 )
-    << platformInfo.GetBitnessName();
-#else
-    << platformInfo.GetArchName();
-#endif
+               << GetPlatformGetBitnessName();
 
     aInfo.SetLibVersion( libVersion );
 
-
-    /* info/description part HTML formatted */
-
+    // info/description part HTML formatted:
     wxString description;
 
     /* short description */
@@ -510,7 +503,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Jonathan Warner" ), CONTRIB_DEV, nullptr ) );
     aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Dan Weatherill" ), CONTRIB_DEV, nullptr ) );
     aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Stefan Weber" ), CONTRIB_DEV, nullptr ) );
-    aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Simon Wells" ), CONTRIB_DEV, nullptr ) );    
+    aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Simon Wells" ), CONTRIB_DEV, nullptr ) );
     aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Dominik Wernberger" ), CONTRIB_DEV, nullptr ) );
     aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Mike Williams" ), CONTRIB_DEV, nullptr ) );
     aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Nick Winters" ), CONTRIB_DEV, nullptr ) );