diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane_rest.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane_rest.dart
index 76fa3e1c..ba672278 100644
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane_rest.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane_rest.dart
@@ -28,6 +28,12 @@ class EditRestRequestPane extends ConsumerWidget {
             .select((value) => value?.httpRequestModel?.hasBody)) ??
         false;
 
+    final scriptsLength = ref.watch(selectedRequestModelProvider
+            .select((value) => value?.preRequestScript.length)) ??
+        ref.watch(selectedRequestModelProvider
+            .select((value) => value?.postRequestScript.length)) ??
+        0;
+
     return RequestPane(
       selectedId: selectedId,
       codePaneVisible: codePaneVisible,
@@ -45,7 +51,7 @@ class EditRestRequestPane extends ConsumerWidget {
         paramLength > 0,
         headerLength > 0,
         hasBody,
-        false, // TODO: Add indicator condition once it is added to [selectedRequestModelProvider]
+        scriptsLength > 0,
       ],
       tabLabels: const [
         kLabelURLParams,
diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/scripts_code_pane.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/scripts_code_pane.dart
index 35a91691..50fa9a1e 100644
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/scripts_code_pane.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/scripts_code_pane.dart
@@ -73,6 +73,11 @@ class _ScriptsCodePaneState extends ConsumerState<ScriptsCodePane> {
                     tabs[i],
                     style: TextStyle(
                       fontSize: 12,
+                      color: _selectedTabIndex == i
+                          ? Theme.of(context)
+                              .colorScheme
+                              .onSecondaryFixedVariant
+                          : Theme.of(context).colorScheme.onSurface,
                     ),
                   ),
                   selected: _selectedTabIndex == i,