diff --git a/dwds/debug_extension_mv3/web/background.dart b/dwds/debug_extension_mv3/web/background.dart
index 36410a523..923e9d3a4 100644
--- a/dwds/debug_extension_mv3/web/background.dart
+++ b/dwds/debug_extension_mv3/web/background.dart
@@ -142,9 +142,8 @@ void _setDebuggableIcon() {
 }
 
 void _setDefaultIcon() {
-  final iconPath = isDevMode()
-      ? 'static_assets/dart_dev.png'
-      : 'static_assets/dart_grey.png';
+  final iconPath =
+      isDevMode ? 'static_assets/dart_dev.png' : 'static_assets/dart_grey.png';
   setExtensionIcon(IconInfo(path: iconPath));
 }
 
diff --git a/dwds/debug_extension_mv3/web/devtools.dart b/dwds/debug_extension_mv3/web/devtools.dart
index d120e9c85..68fb0930b 100644
--- a/dwds/debug_extension_mv3/web/devtools.dart
+++ b/dwds/debug_extension_mv3/web/devtools.dart
@@ -44,7 +44,7 @@ void _maybeCreatePanels() async {
   if (!isInternalBuild) return;
   // Create a Debugger panel for all internal apps:
   chrome.devtools.panels.create(
-    isDevMode() ? '[DEV] Dart Debugger' : 'Dart Debugger',
+    isDevMode ? '[DEV] Dart Debugger' : 'Dart Debugger',
     '',
     'static_assets/debugger_panel.html',
     allowInterop((ExtensionPanel panel) => _onPanelAdded(panel, debugInfo)),
@@ -53,7 +53,7 @@ void _maybeCreatePanels() async {
   final isFlutterApp = debugInfo.isFlutterApp ?? false;
   if (isFlutterApp) {
     chrome.devtools.panels.create(
-      isDevMode() ? '[DEV] Flutter Inspector' : 'Flutter Inspector',
+      isDevMode ? '[DEV] Flutter Inspector' : 'Flutter Inspector',
       '',
       'static_assets/inspector_panel.html',
       allowInterop((ExtensionPanel panel) => _onPanelAdded(panel, debugInfo)),
diff --git a/dwds/debug_extension_mv3/web/logger.dart b/dwds/debug_extension_mv3/web/logger.dart
index d0599eca8..b418392f5 100644
--- a/dwds/debug_extension_mv3/web/logger.dart
+++ b/dwds/debug_extension_mv3/web/logger.dart
@@ -45,7 +45,7 @@ void _log(
   _LogLevel? level,
   String? prefix,
 }) {
-  if (!verbose && !isDevMode()) return;
+  if (!verbose && !isDevMode) return;
   final logMsg = prefix != null ? '[$prefix] $msg' : msg;
   final logLevel = level ?? _LogLevel.info;
   switch (logLevel) {
diff --git a/dwds/debug_extension_mv3/web/utils.dart b/dwds/debug_extension_mv3/web/utils.dart
index d122140ae..d6023a765 100644
--- a/dwds/debug_extension_mv3/web/utils.dart
+++ b/dwds/debug_extension_mv3/web/utils.dart
@@ -90,13 +90,15 @@ void setExtensionIcon(IconInfo info) {
 
 bool? _isDevMode;
 
-bool isDevMode() {
+bool get isDevMode {
   if (_isDevMode != null) {
     return _isDevMode!;
   }
   final extensionManifest = chrome.runtime.getManifest();
   final extensionName = getProperty(extensionManifest, 'name') ?? '';
-  return extensionName.contains('DEV');
+  final isDevMode = extensionName.contains('DEV');
+  _isDevMode = isDevMode;
+  return isDevMode;
 }
 
 String addQueryParameters(