diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
index a805494c8..d15a9c105 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
@@ -220,6 +220,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment{
 		followMenuItem.setTitle(getString(hashtag.following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
 		followMenuItem.setIcon(hashtag.following ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
 		pinMenuItem.setShowAsAction(toolbarContentVisible ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_ALWAYS);
+		super.updatePinButton(pinMenuItem);
 		if(toolbarContentVisible){
 			UiUtils.enableOptionsMenuIcons(getContext(), optionsMenu);
 		}else{
@@ -230,7 +231,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment{
 	@Override
 	public void updatePinButton(MenuItem pin){
 		super.updatePinButton(pin);
-		UiUtils.insetPopupMenuIcon(getContext(), pin);
+		if(toolbarContentVisible) UiUtils.insetPopupMenuIcon(getContext(), pin);
 	}
 
 	@Override