diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 909a2e91d..2a2f63577 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -217,35 +217,33 @@
 
 				</LinearLayout>
 
-				<FrameLayout
+				<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
+					android:id="@+id/note_edit_wrap"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_below="@id/username"
-					android:id="@+id/note_edit_wrap"
 					android:layout_marginTop="4dp"
 					android:layout_marginBottom="12dp"
 					android:layout_marginHorizontal="16dp"
+					app:labelTextColor="@color/m3_outlined_text_field_label"
+					android:foreground="@drawable/bg_m3_outlined_text_field"
 					android:visibility="gone">
 
 					<EditText
 						android:id="@+id/note_edit"
 						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:minHeight="52dp"
-						android:paddingVertical="15dp"
-						android:textColor="?colorM3OnSurface"
+						android:layout_height="match_parent"
+						android:layout_marginTop="8dp"
+						android:padding="16dp"
+						android:background="@null"
 						android:inputType="text|textMultiLine|textCapSentences"
-						android:singleLine="false"
-						android:background="@drawable/bg_note_edit"
-						android:paddingEnd="52dp"
-						android:paddingStart="20dp"
-						android:elevation="0dp"
+						android:maxHeight="200dp"
 						android:hint="@string/mo_personal_note"
 						tools:ignore="RtlSymmetry" />
 
 					<FrameLayout
 						android:layout_width="52dp"
 						android:layout_height="52dp"
+						android:paddingTop="8dp"
 						android:layout_gravity="end">
 
 						<ImageButton
@@ -268,8 +266,7 @@
 							android:visibility="gone" />
 
 					</FrameLayout>
-
-				</FrameLayout>
+				</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
 
 				<org.joinmastodon.android.ui.views.LinkedTextView
 					android:id="@+id/bio"