diff --git a/es-app/src/Gamelist.cpp b/es-app/src/Gamelist.cpp
index a6ac09202..9ba33268d 100644
--- a/es-app/src/Gamelist.cpp
+++ b/es-app/src/Gamelist.cpp
@@ -302,7 +302,7 @@ void updateGamelist(SystemData* system)
             Utils::FileSystem::createDirectory(Utils::FileSystem::getParent(xmlWritePath));
 
             LOG(LogDebug) << "Gamelist::updateGamelist(): Added/updated " << numUpdated <<
-                    (numUpdated == 1 ? " entity in '" : " entities in \"") << xmlReadPath << "\"";
+                    (numUpdated == 1 ? " entity in \"" : " entities in \"") << xmlReadPath << "\"";
 
             #if defined(_WIN64)
             if (!doc.save_file(Utils::String::stringToWideString(xmlWritePath).c_str())) {
diff --git a/es-core/src/guis/GuiComplexTextEditPopup.cpp b/es-core/src/guis/GuiComplexTextEditPopup.cpp
index bf5a0a08a..6c3ca11e3 100644
--- a/es-core/src/guis/GuiComplexTextEditPopup.cpp
+++ b/es-core/src/guis/GuiComplexTextEditPopup.cpp
@@ -62,10 +62,16 @@ GuiComplexTextEditPopup::GuiComplexTextEditPopup(
 
     std::vector< std::shared_ptr<ButtonComponent> > buttons;
     buttons.push_back(std::make_shared<ButtonComponent>(mWindow, acceptBtnText, acceptBtnText,
-            [this, okCallback] { okCallback(mText->getValue()); delete this; }));
+            [this, okCallback] {
+                okCallback(mText->getValue());
+                delete this;
+            }));
     buttons.push_back(std::make_shared<ButtonComponent>(mWindow, loadBtnText, loadBtnHelpText,
             [this, infoString2] {
-                mText->setValue(infoString2); mText->setCursor(infoString2.size()); }));
+                mText->setValue(infoString2);
+                mText->setCursor(0);
+                mText->setCursor(infoString2.size());
+            }));
     buttons.push_back(std::make_shared<ButtonComponent>(mWindow, clearBtnText, clearBtnHelpText,
             [this] { mText->setValue(""); }));
     if (!mHideCancelButton)