diff --git a/src/CryptoID.hs b/src/CryptoID.hs
index c66005307..3720c461b 100644
--- a/src/CryptoID.hs
+++ b/src/CryptoID.hs
@@ -48,6 +48,9 @@ decCryptoIDs [ ''SubmissionId
 newtype SubmissionMode = SubmissionMode (Maybe CryptoUUIDSubmission)
   deriving (Show, Read, Eq)
 
+newSubmission :: SubmissionMode
+newSubmission = SubmissionMode Nothing
+
 instance PathPiece SubmissionMode where
     fromPathPiece "new" = Just $ SubmissionMode Nothing
     fromPathPiece s     = SubmissionMode . Just <$> fromPathPiece s
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index d39e44dca..455662401 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -200,7 +200,7 @@ getSheetShowR tid csh shn = do
         [ PageActionPrime $ MenuItem
           { menuItemLabel = "Abgabe"
           , menuItemIcon  = Nothing
-          , menuItemRoute = CSheetR tid csh SheetNewR
+          , menuItemRoute = CSheetR tid csh (SubmissionR shn newSubmission)
           , menuItemAccessCallback' = return True
           }
         ]
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 68c908895..ac25a999f 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -213,13 +213,13 @@ postSubmissionR tid csh shn (SubmissionMode mcid) = do
         <hr>
         <h2>
           <a href=@{SubmissionDownloadArchiveR arCid}>Archiv
+        $forall (name,time) <- lastEdits
+          <div>last edited by #{name} at #{formatTimeGerWDT time}
         $maybe cid <- mcid
           <h3>Enthaltene Dateien:
           $forall (Entity _ File{..}) <- oldfiles
             <a href=@{SubmissionDownloadSingleR cid fileTitle}>
               #{fileTitle}
-        $forall (name,time) <- lastEdits
-          <div>last edited by #{name} at #{formatTimeGerWDT time}
     |]