diff --git a/client/src/app/core/repositories/motions/motion-repository.service.ts b/client/src/app/core/repositories/motions/motion-repository.service.ts
index 37419e0e9..dd537d68a 100644
--- a/client/src/app/core/repositories/motions/motion-repository.service.ts
+++ b/client/src/app/core/repositories/motions/motion-repository.service.ts
@@ -101,7 +101,8 @@ export class MotionRepositoryService extends BaseAgendaContentObjectRepository<V
             Mediafile,
             Tag,
             MotionChangeRecommendation,
-            PersonalNote
+            PersonalNote,
+            Motion
         ]);
         config.get<SortProperty>('motions_motions_sorting').subscribe(conf => {
             this.sortProperty = conf;
diff --git a/client/src/app/site/motions/models/view-motion.ts b/client/src/app/site/motions/models/view-motion.ts
index 868bfc4f1..50fe69337 100644
--- a/client/src/app/site/motions/models/view-motion.ts
+++ b/client/src/app/site/motions/models/view-motion.ts
@@ -628,7 +628,10 @@ export class ViewMotion extends BaseAgendaViewModel implements Searchable {
 
     public getSlide(configService: ConfigService): ProjectorElementBuildDeskriptor {
         const slideOptions = [];
-        if ((this.changeRecommendations && this.changeRecommendations.length) || this.amendments) {
+        if (
+            (this.changeRecommendations && this.changeRecommendations.length) ||
+            (this.amendments && this.amendments.length)
+        ) {
             slideOptions.push({
                 key: 'mode',
                 displayName: _('Which version?'),
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
index 0125bbe08..687a9c822 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
@@ -1,7 +1,7 @@
 <os-head-bar
     [mainButton]="perms.isAllowed('update', motion)"
     mainButtonIcon="edit"
-    [prevUrl]="backTarget"
+    [prevUrl]="getPrevUrl()"
     [nav]="false"
     [editMode]="editMotion"
     (mainEvent)="setEditMode(!editMotion)"
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
index 368fe491e..01289c318 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
@@ -336,13 +336,6 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
      */
     private editNotificationSubscription: Subscription;
 
-    /**
-     * Determine what to "return" to.
-     * Handles the target for clicking the back button
-     * Several angular peculiarities prevent dynamic changing from working right now
-     */
-    public backTarget = '../..';
-
     /**
      * Hold the subscription to the navigation.
      * This cannot go into the subscription-list, since it should
@@ -1479,6 +1472,20 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
         this.raiseError(error);
     }
 
+    /**
+     * Tries to "logically" navigate back. If the motion has a parent, it will
+     * try to navigate to the parent
+     * rather than just into the list view.
+     *
+     * @returns the target to navigate to
+     */
+    public getPrevUrl(): string {
+        if (this.motion.parent_id) {
+            return `../../${this.motion.parent_id}`;
+        }
+        return '../..';
+    }
+
     /**
      * Function to prevent automatically closing the window/tab,
      * if the user is editing a motion.