diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
index 18507367..66dcb0eb 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
@@ -186,7 +186,7 @@ public class FolderActivity extends SyncthingActivity {
 
         super.onCreate(savedInstanceState);
         ((SyncthingApp) getApplication()).component().inject(this);
-        setContentView(R.layout.fragment_folder);
+        setContentView(R.layout.activity_folder);
 
         mIsCreateMode = getIntent().getBooleanExtra(EXTRA_IS_CREATE, false);
         setTitle(mIsCreateMode ? R.string.create_folder : R.string.edit_folder);
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/activity_folder.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_folder.xml
rename to app/src/main/res/layout/activity_folder.xml