diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2b07c159..fee42525 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,6 +36,11 @@
             android:name=".AddProfileActivity"
             android:theme="@style/AppTheme.TransparentActionBar">
         </activity>
+        <activity
+            android:name=".EditProfileActivity"
+            android:label="Edit profile"
+            android:theme="@style/AppTheme.TransparentActionBar">
+        </activity>
         <activity
             android:name=".IntroActivity"
             android:theme="@style/Theme.Intro"
diff --git a/app/src/main/java/me/impy/aegis/MainActivity.java b/app/src/main/java/me/impy/aegis/MainActivity.java
index 2cbf2627..b359bd0d 100644
--- a/app/src/main/java/me/impy/aegis/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/MainActivity.java
@@ -34,10 +34,11 @@ public class MainActivity extends AegisActivity implements KeyProfileView.Listen
     // activity request codes
     private static final int CODE_GET_KEYINFO = 0;
     private static final int CODE_ADD_KEYINFO = 1;
-    private static final int CODE_DO_INTRO = 2;
-    private static final int CODE_DECRYPT = 3;
-    private static final int CODE_IMPORT = 4;
-    private static final int CODE_PREFERENCES = 5;
+    private static final int CODE_EDIT_KEYINFO = 2;
+    private static final int CODE_DO_INTRO = 3;
+    private static final int CODE_DECRYPT = 4;
+    private static final int CODE_IMPORT = 5;
+    private static final int CODE_PREFERENCES = 6;
 
     // permission request codes
     private static final int CODE_PERM_EXPORT = 0;
@@ -414,7 +415,7 @@ public class MainActivity extends AegisActivity implements KeyProfileView.Listen
         }
     }
 
-    private BottomSheetDialog createBottomSheet(KeyProfile profile) {
+    private BottomSheetDialog createBottomSheet(final KeyProfile profile) {
         View bottomSheetView = getLayoutInflater().inflate(R.layout.bottom_sheet_edit_profile, null);
         LinearLayout copyLayout = bottomSheetView.findViewById(R.id.copy_button);
         LinearLayout deleteLayout = bottomSheetView.findViewById(R.id.delete_button);
@@ -442,7 +443,9 @@ public class MainActivity extends AegisActivity implements KeyProfileView.Listen
 
         editLayout.setOnClickListener(view -> {
             bottomDialog.dismiss();
-            Toast.makeText(this.getApplicationContext(), "Coming soon", Toast.LENGTH_SHORT).show();
+            Intent intent = new Intent(this, EditProfileActivity.class);
+            intent.putExtra("KeyProfile", profile);
+            startActivityForResult(intent, CODE_EDIT_KEYINFO);
         });
 
         return bottomDialog;
diff --git a/app/src/main/res/layout/fragment_keyprofile_view.xml b/app/src/main/res/layout/fragment_keyprofile_view.xml
index ac14d614..ab6bfa91 100644
--- a/app/src/main/res/layout/fragment_keyprofile_view.xml
+++ b/app/src/main/res/layout/fragment_keyprofile_view.xml
@@ -7,5 +7,6 @@
     <android.support.v7.widget.RecyclerView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:scrollbars="vertical"
         android:id="@+id/rvKeyProfiles"/>
 </LinearLayout>