         } else {
             cell = collectionView.dequeueReusableCellWithReuseIdentifier(PhotoCollectionViewCell.cellIdentifier(), forIndexPath: indexPath) as! PhotoCollectionViewCell
         }
-        cell.contentView.rotateToDeviceOrientation()
+        // This cannot use the currentRotation call as it might be called when .FaceUp or .FaceDown is device-orientation
+        cell.contentView.rotateToDeviceOrientation(orientation)
         cell.delegate = self
         return cell
     }

    private var pickerButton : UIButton!
    private var closeButton : UIButton!
    private let buttonMargin : CGFloat = 12

    deinit {
        captureManager.stop(nil)

            switch UIDevice.currentDevice().orientation {
            case .FaceDown, .FaceUp, .Unknown:
                ()
            case .LandscapeLeft, .LandscapeRight, .Portrait, .PortraitUpsideDown:
                self.orientation = UIDevice.currentDevice().orientation
                self.updateWidgetsToOrientation()
            }
        }
    }
