diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 8cc01f6dc6..01108b5cfa 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -207,14 +207,14 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
         mSettingNameText->setToolTip(controlp->getName());
         mComment->setVisible(true);
 
-        std::string old_text = mComment->getText();
         std::string new_text = controlp->getComment();
         // Don't setText if not nessesary, it will reset scroll
         // This is a debug UI that reads from xml, there might
         // be use cases where comment changes, but not the name
-        if (old_text != new_text)
+        if (mOldText != new_text)
         {
             mComment->setText(controlp->getComment());
+            mOldText = new_text;
         }
 
         mValSpinner1->setMaxValue(F32_MAX);
@@ -467,6 +467,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
           }
           default:
             mComment->setText(std::string("unknown"));
+            mOldText = "unknown";
             break;
         }
     }
diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
index b813cf4a74..8781cd3b67 100644
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -82,6 +82,7 @@ class LLFloaterSettingsDebug final
     LLColorSwatchCtrl* mColorSwatch = nullptr;
 
     std::string mSearchFilter;
+    std::string mOldText;
 };
 
 #endif //LLFLOATERDEBUGSETTINGS_H
diff --git a/indra/newview/skins/default/xui/en/floater_test_slapp.xml b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
index dd2720816a..5a13a0147e 100644
--- a/indra/newview/skins/default/xui/en/floater_test_slapp.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
@@ -8,7 +8,7 @@
  width="500">
    <floater.string
     name="remove_folder_slapp">
-    secondlife://app/remove_folder/?folder_id=
+    secondlife:///app/remove_folder/?folder_id=
    </floater.string>
    <text
     type="string"
@@ -42,7 +42,7 @@
     width="450"
     layout="topleft"
     left="16">
-        secondlife://app/wear_folder/?folder_name=Daisy
+        secondlife:///app/wear_folder/?folder_name=Daisy
    </text>
    <text
     type="string"
@@ -63,7 +63,7 @@
     width="450"
     layout="topleft"
     left="16">
-        secondlife://app/add_folder/?folder_name=Cardboard%20Boxbot
+        secondlife:///app/add_folder/?folder_name=Cardboard%20Boxbot
    </text>
    <text
     type="string"
@@ -73,7 +73,7 @@
     height="16"
     width="450"
     layout="topleft">
-        secondlife://app/add_folder/?folder_id=59219db2-c260-87d3-213d-bb3bc298a3d8
+        secondlife:///app/add_folder/?folder_id=59219db2-c260-87d3-213d-bb3bc298a3d8
    </text>
    <text
     type="string"
@@ -118,6 +118,6 @@
     name="remove_folder_txt"
     layout="topleft"
     left="16">
-        secondlife://app/remove_folder/?folder_id=
+        secondlife:///app/remove_folder/?folder_id=
    </text>
 </floater>