diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62ddebbe..a1adfc2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,8 @@ This release includes many iOS 11 and iPhone X hot fixes.
 - Exposing auto-completion variables. By @dzenbot (#561)
 
 ##### Hot Fixes & Enhancements:
-- Fixed the text input not being interactive on iOS. Making `SLKTextInputbar` a UIView subclass instead of `UIToolbar`. By @dzenbot (#624)
+- Fixed the text input not being interactive on iOS 11. By @dzenbot (#624)
+- Fixed iPhone X issue where the text input bar wouldn't expand to the bottom of the screen, below the home indicator. (#619)
 - Fixed scroll view content inset adjustments on iOS 11. By @gim- (#643)
 - Fixed compiler error in example app. By @BasThomas (#629)
 - Fixed content offset for keyboard when uninverted. By @ZAndyL (#542)
diff --git a/Source/SLKTextInputbar.h b/Source/SLKTextInputbar.h
index 74f21604..2ca5e0f6 100644
--- a/Source/SLKTextInputbar.h
+++ b/Source/SLKTextInputbar.h
@@ -26,7 +26,7 @@ typedef NS_ENUM(NSUInteger, SLKCounterPosition) {
 NS_ASSUME_NONNULL_BEGIN
 
 /** @name A custom tool bar encapsulating messaging controls. */
-@interface SLKTextInputbar : UIView
+@interface SLKTextInputbar : UIToolbar
 
 /** The centered text input view.
  The maximum number of lines is configured by default, to best fit each devices dimensions.
diff --git a/Source/SLKTextInputbar.m b/Source/SLKTextInputbar.m
index 83eaf99d..ca970691 100644
--- a/Source/SLKTextInputbar.m
+++ b/Source/SLKTextInputbar.m
@@ -19,8 +19,6 @@
 
 @interface SLKTextInputbar ()
 
-@property (nonatomic, strong) UIView *hairlineView;
-
 @property (nonatomic, strong) NSLayoutConstraint *textViewBottomMarginC;
 @property (nonatomic, strong) NSLayoutConstraint *contentViewHC;
 @property (nonatomic, strong) NSLayoutConstraint *leftButtonWC;
@@ -85,7 +83,10 @@ - (void)slk_commonInit
     self.autoHideRightButton = YES;
     self.editorContentViewHeight = 38.0;
     self.contentInset = UIEdgeInsetsMake(5.0, 8.0, 5.0, 8.0);
-    self.backgroundColor = [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1.0]; //UIToolbar native bar tint color
+
+    // Since iOS 11, it is required to call -layoutSubviews before adding custom subviews
+    // so private UIToolbar subviews don't interfere on the touch hierarchy
+    [self layoutSubviews];
 
     [self addSubview:self.editorContentView];
     [self addSubview:self.leftButton];
@@ -93,7 +94,6 @@ - (void)slk_commonInit
     [self addSubview:self.textView];
     [self addSubview:self.charCountLabel];
     [self addSubview:self.contentView];
-    [self addSubview:self.hairlineView];
 
     [self slk_setupViewConstraints];
     [self slk_updateConstraintConstants];
@@ -156,16 +156,6 @@ - (SLKTextView *)textView
     return _textView;
 }
 
-- (UIView *)hairlineView
-{
-    if (!_hairlineView) {
-        _hairlineView = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, [UIScreen mainScreen].bounds.size.width, 0.5)];
-        _hairlineView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleBottomMargin;
-        _hairlineView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.3];
-    }
-    return _hairlineView;
-}
-
 - (UIView *)contentView
 {
     if (!_contentView) {
@@ -422,7 +412,7 @@ - (NSUInteger)slk_defaultNumberOfLines
 
 - (void)setBackgroundColor:(UIColor *)color
 {
-    [super setBackgroundColor:color];
+    self.barTintColor = color;
 
     self.editorContentView.backgroundColor = color;
 }
diff --git a/Source/SLKTextViewController.m b/Source/SLKTextViewController.m
index 9d087615..60a3fc18 100644
--- a/Source/SLKTextViewController.m
+++ b/Source/SLKTextViewController.m
@@ -237,6 +237,13 @@ - (void)viewDidLayoutSubviews
     [super viewDidLayoutSubviews];
 }
 
+- (void)viewSafeAreaInsetsDidChange
+{
+    [super viewSafeAreaInsetsDidChange];
+    
+    [self slk_updateViewConstraints];
+}
+
 
 #pragma mark - Getters
 
@@ -417,7 +424,7 @@ - (CGFloat)slk_appropriateKeyboardHeightFromRect:(CGRect)rect
 
 - (CGFloat)slk_appropriateBottomMargin
 {
-    // A bottom margin is required only if the view is extended out of it bounds
+    // A bottom margin is required if the view is extended out of it bounds
     if ((self.edgesForExtendedLayout & UIRectEdgeBottom) > 0) {
         
         UITabBar *tabBar = self.tabBarController.tabBar;
@@ -428,6 +435,13 @@ - (CGFloat)slk_appropriateBottomMargin
         }
     }
     
+    // A bottom margin is required for iPhone X
+    if (@available(iOS 11.0, *)) {
+        if (!self.textInputbar.isHidden) {
+            return self.view.safeAreaInsets.bottom;
+        }
+    }
+    
     return 0.0;
 }
 
@@ -892,6 +906,10 @@ - (void)setTextInputbarHidden:(BOOL)hidden animated:(BOOL)animated
     }
     
     _textInputbar.hidden = hidden;
+
+    if (@available(iOS 11.0, *)) {
+        [self viewSafeAreaInsetsDidChange];
+    }
     
     __weak typeof(self) weakSelf = self;
     
@@ -2237,7 +2255,7 @@ - (void)slk_setupViewConstraints
     NSDictionary *views = @{@"scrollView": self.scrollViewProxy,
                             @"autoCompletionView": self.autoCompletionView,
                             @"typingIndicatorView": self.typingIndicatorProxyView,
-                            @"textInputbar": self.textInputbar,
+                            @"textInputbar": self.textInputbar
                             };
     
     [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[scrollView(0@750)][typingIndicatorView(0)]-0@999-[textInputbar(0)]|" options:0 metrics:nil views:views]];