         let keyboardViewEndFrame = view.convert(keyboardScreenEndFrame, from: view.window)
         
         if notification.name == Notification.Name.UIKeyboardWillHide {
-            scrollView.contentInset = UIEdgeInsets.zero
+            scrollView.contentInset = UIEdgeInsets(top: 50, left: 0, bottom: 0, right: 0)
         } else {
-            scrollView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: keyboardViewEndFrame.height, right: 0)
-        }
-        
+            scrollView.contentInset = UIEdgeInsets(top: 50, left: 0, bottom: keyboardViewEndFrame.height, right: 0)
+        }
+
         scrollView.scrollIndicatorInsets = scrollView.contentInset
-        scrollView.scrollRectToVisible(CGRect(x: 0, y: scrollView.frame.maxY, width: view.frame.width, height: view.frame.height), animated: true)
     }
     
     // MARK - Views

        imagePreviewButton.trailingAnchor.constraint(equalTo: bodyField.trailingAnchor, constant: -8).isActive = true
        imagePreviewButton.bottomAnchor.constraint(equalTo: bodyField.bottomAnchor, constant: -8).isActive = true
        
        activitySpinner.centerXAnchor.constraint(equalTo: bodyField.centerXAnchor).isActive = true
        activitySpinner.centerYAnchor.constraint(equalTo: bodyField.centerYAnchor).isActive = true
    }

    fileprivate let bundle = Bundle(for: FeedbackInterfaceViewController.self)
    
    var reporter: FeedbackReporter?
    var shouldFetchScreenshot: Bool
    
    internal init(reporter: FeedbackReporter?, shouldFetchScreenshot: Bool) {
