diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp
index e15781eeb8..db98eb25c7 100644
--- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp
+++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp
@@ -115,8 +115,7 @@ void DirectoryContentsList::setFileFilter (const FileFilter* newFileFilter)
 }
 
 //==============================================================================
-bool DirectoryContentsList::getFileInfo (const int index,
-                                         FileInfo& result) const
+bool DirectoryContentsList::getFileInfo (const int index, FileInfo& result) const
 {
     const ScopedLock sl (fileListLock);
 
diff --git a/modules/juce_gui_extra/misc/juce_LiveConstantEditor.cpp b/modules/juce_gui_extra/misc/juce_LiveConstantEditor.cpp
index 38c9ab9c92..79ae59ec89 100644
--- a/modules/juce_gui_extra/misc/juce_LiveConstantEditor.cpp
+++ b/modules/juce_gui_extra/misc/juce_LiveConstantEditor.cpp
@@ -117,6 +117,8 @@ LivePropertyEditorBase::LivePropertyEditorBase (LiveValueBase& v, CodeDocument&
 
     name.setFont (13.0f);
     name.setText (v.name, dontSendNotification);
+    valueEditor.setMultiLine (true);
+    valueEditor.setReturnKeyStartsNewLine (true);
     valueEditor.setText (v.getStringValue (wasHex), dontSendNotification);
     valueEditor.addListener (this);
     sourceEditor.setReadOnly (true);
@@ -138,11 +140,17 @@ void LivePropertyEditorBase::resized()
     Rectangle<int> top (left.removeFromTop (25));
     resetButton.setBounds (top.removeFromRight (35).reduced (0, 3));
     name.setBounds (top);
-    valueEditor.setBounds (left.removeFromTop (25));
-    left.removeFromTop (2);
 
     if (customComp != nullptr)
+    {
+        valueEditor.setBounds (left.removeFromTop (25));
+        left.removeFromTop (2);
         customComp->setBounds (left);
+    }
+    else
+    {
+        valueEditor.setBounds (left);
+    }
 
     r.removeFromLeft (4);
     sourceEditor.setBounds (r);
diff --git a/modules/juce_gui_extra/misc/juce_LiveConstantEditor.h b/modules/juce_gui_extra/misc/juce_LiveConstantEditor.h
index c293a2156a..5e3a495589 100644
--- a/modules/juce_gui_extra/misc/juce_LiveConstantEditor.h
+++ b/modules/juce_gui_extra/misc/juce_LiveConstantEditor.h
@@ -70,7 +70,7 @@ namespace LiveConstantEditor
     template <typename Type>
     inline String getAsCode (Type& v, bool preferHex)       { return getAsString (v, preferHex); }
     inline String getAsCode (Colour v, bool)                { return "Colour (0x" + String::toHexString ((int) v.getARGB()).paddedLeft ('0', 8) + ")"; }
-    inline String getAsCode (const String& v, bool)         { return "\"" + v + "\""; }
+    inline String getAsCode (const String& v, bool)         { return CppTokeniserFunctions::addEscapeChars(v).quoted(); }
     inline String getAsCode (const char* v, bool)           { return getAsCode (String (v), false); }
 
     template <typename Type>