diff --git a/Linphone/core/fps-counter/FPSCounter.cpp b/Linphone/core/fps-counter/FPSCounter.cpp
index 8040772c2..f6988f2a2 100644
--- a/Linphone/core/fps-counter/FPSCounter.cpp
+++ b/Linphone/core/fps-counter/FPSCounter.cpp
@@ -29,6 +29,8 @@
 FPSCounter::FPSCounter(QQuickItem *parent) : QQuickPaintedItem(parent), _currentFPS(0), _cacheCount(0) {
 	_times.clear();
 	setFlag(QQuickItem::ItemHasContents);
+	connect(this, &FPSCounter::visibleChanged, this,
+	        [this]() { update(); }); // If not call at first, item will never call paint.
 }
 
 FPSCounter::~FPSCounter() {
@@ -56,15 +58,8 @@ int FPSCounter::fps() const {
 }
 
 void FPSCounter::paint(QPainter *painter) {
-	recalculateFPS();
-	// lDebug()<< __FUNCTION__;
-	/*
-	QBrush brush(Qt::yellow);
-
-	painter->setBrush(brush);
-	painter->setPen(Qt::NoPen);
-	painter->setRenderHint(QPainter::Antialiasing);
-	painter->drawRoundedRect(0, 0, boundingRect().width(), boundingRect().height(), 0, 0);
-*/
-	update();
+	if (isVisible()) {
+		recalculateFPS();
+		update(); // Request next frame
+	}
 }
diff --git a/Linphone/core/fps-counter/FPSCounter.hpp b/Linphone/core/fps-counter/FPSCounter.hpp
index 67dd000c0..ba51c7613 100644
--- a/Linphone/core/fps-counter/FPSCounter.hpp
+++ b/Linphone/core/fps-counter/FPSCounter.hpp
@@ -26,7 +26,7 @@ class FPSCounter : public QQuickPaintedItem {
 public:
 	FPSCounter(QQuickItem *parent = 0);
 	~FPSCounter();
-	void paint(QPainter *);
+	virtual void paint(QPainter *) override;
 	Q_INVOKABLE int fps() const;
 
 signals:
diff --git a/Linphone/view/Control/Input/DecoratedTextField.qml b/Linphone/view/Control/Input/DecoratedTextField.qml
index ace93bf34..9f3a27e12 100644
--- a/Linphone/view/Control/Input/DecoratedTextField.qml
+++ b/Linphone/view/Control/Input/DecoratedTextField.qml
@@ -33,7 +33,7 @@ FormItemLayout {
 		id: textField
 		Layout.preferredWidth: 360 * DefaultStyle.dp
 		placeholderText: useTitleAsPlaceHolder ? mainItem.title : mainItem.placeHolder
-		initialText: mainItem.propertyOwner[mainItem.propertyName]
+		initialText: mainItem.propertyOwner[mainItem.propertyName] || ''
 		customWidth: mainItem.parent.width
 		propertyName: mainItem.propertyName
 		propertyOwner: mainItem.propertyOwner