diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
index 2c785024d..c3a1c0735 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "base/event_filter.h"
 #include "data/data_peer.h"
+#include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
@@ -197,6 +198,9 @@ UsernamesList::UsernamesList(
 : RpWidget(parent)
 , _show(show)
 , _peer(peer)
+, _isBot(peer->isUser()
+	&& peer->asUser()->botInfo
+	&& peer->asUser()->botInfo->canEditInformation)
 , _focusCallback(std::move(focusCallback)) {
 	{
 		auto &api = _peer->session().api();
@@ -250,7 +254,8 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 			object_ptr<Row>(content, username, _show, link));
 		_rows.push_back(row);
 		row->addClickHandler([=] {
-			if (_reordering || (!_peer->isSelf() && !_peer->isChannel())) {
+			if (_reordering
+				|| (!_peer->isSelf() && !_peer->isChannel() && !_isBot)) {
 				return;
 			}
 
@@ -263,6 +268,10 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 				? (username.active
 					? tr::lng_usernames_deactivate_description()
 					: tr::lng_usernames_activate_description())
+				: _isBot
+				? (username.active
+					? tr::lng_bot_usernames_deactivate_description()
+					: tr::lng_bot_usernames_activate_description())
 				: (username.active
 					? tr::lng_channel_usernames_deactivate_description()
 					: tr::lng_channel_usernames_activate_description());
@@ -359,6 +368,8 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 			_container,
 			_peer->isSelf()
 				? tr::lng_usernames_description()
+				: _isBot
+				? tr::lng_bot_usernames_description()
 				: tr::lng_channel_usernames_description());
 	}
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.h b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.h
index c93bd232a..483ca2453 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.h
@@ -41,6 +41,7 @@ private:
 
 	const std::shared_ptr<Ui::Show> _show;
 	const not_null<PeerData*> _peer;
+	const bool _isBot = false;
 	Fn<void()> _focusCallback;
 
 	base::unique_qptr<Ui::VerticalLayout> _container;