diff --git a/Telegram/SourceFiles/basic_types.h b/Telegram/SourceFiles/basic_types.h
index 0b9e39603..62c9c4056 100644
--- a/Telegram/SourceFiles/basic_types.h
+++ b/Telegram/SourceFiles/basic_types.h
@@ -824,6 +824,13 @@ public:
 		}
 	}
 
+	template <typename... Args>
+	void makeIfNull(Args&&... args) {
+		if (isNull()) {
+			reset(new T(std::forward<Args>(args)...));
+		}
+	};
+
 	T *data() const {
 		return _p;
 	}
@@ -857,13 +864,6 @@ private:
 
 };
 
-template <typename T>
-using NeverFreedPointerCreator = T*(*)();
-template <typename T, typename... Args>
-inline NeverFreedPointerCreator<T> MakeNeverFreedCreator(Args&&... args) {
-	return [&args...]() -> T* { return new T(std_::forward<Args>(args)...); };
-}
-
 // This pointer is used for static non-POD variables that are allocated
 // on first use by constructor and are never automatically freed.
 template <typename T>
diff --git a/Telegram/SourceFiles/gui/text.cpp b/Telegram/SourceFiles/gui/text.cpp
index c1b14ec0f..c6ab96669 100644
--- a/Telegram/SourceFiles/gui/text.cpp
+++ b/Telegram/SourceFiles/gui/text.cpp
@@ -86,7 +86,7 @@ bool ClickHandler::setActive(const ClickHandlerPtr &p, ClickHandlerHost *host) {
 		}
 	}
 	if (p) {
-		_active.createIfNull(MakeNeverFreedCreator<ClickHandlerPtr>());
+		_active.makeIfNull();
 		*_active = p;
 		if ((_activeHost = host)) {
 			bool emitClickHandlerActiveChanged = (!_pressed || !*_pressed || *_pressed == *_active);
diff --git a/Telegram/SourceFiles/gui/text.h b/Telegram/SourceFiles/gui/text.h
index 08301e1b6..997f3e1a7 100644
--- a/Telegram/SourceFiles/gui/text.h
+++ b/Telegram/SourceFiles/gui/text.h
@@ -366,7 +366,7 @@ public:
 		if (!_active || !*_active) {
 			return;
 		}
-		_pressed.createIfNull(MakeNeverFreedCreator<ClickHandlerPtr>());
+		_pressed.makeIfNull();
 		*_pressed = *_active;
 		if ((_pressedHost = _activeHost)) {
 			_pressedHost->clickHandlerPressedChanged(*_pressed, true);