diff --git a/Riot/Modules/Room/MXKRoomViewController.h b/Riot/Modules/Room/MXKRoomViewController.h
index dd3bfd205..c56e7fb7b 100644
--- a/Riot/Modules/Room/MXKRoomViewController.h
+++ b/Riot/Modules/Room/MXKRoomViewController.h
@@ -214,7 +214,7 @@ typedef NS_ENUM(NSUInteger, MXKRoomViewControllerJoinRoomResult) {
 
 @property (weak, nonatomic) IBOutlet UITableView *bubblesTableView;
 @property (weak, nonatomic) IBOutlet UIView *roomTitleViewContainer;
-@property (weak, nonatomic) IBOutlet UIView *roomInputToolbarContainer;
+@property (strong, nonatomic) IBOutlet UIView *roomInputToolbarContainer;
 @property (weak, nonatomic) IBOutlet UIView *roomActivitiesContainer;
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *bubblesTableViewTopConstraint;
diff --git a/Riot/Modules/Room/RoomViewController.h b/Riot/Modules/Room/RoomViewController.h
index af49e8f6e..0cae86a77 100644
--- a/Riot/Modules/Room/RoomViewController.h
+++ b/Riot/Modules/Room/RoomViewController.h
@@ -115,6 +115,9 @@ extern NSTimeInterval const kResizeComposerAnimationDuration;
 // The voice broadcast service
 @property (nonatomic, nullable) VoiceBroadcastService *voiceBroadcastService;
 
+@property (strong, nonatomic) IBOutletCollection(NSLayoutConstraint) NSArray<NSLayoutConstraint*> *toolbarContainerConstraints;
+
+
 /**
  Retrieve the live data source in cases where the timeline is not live.
 
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index edc0d8700..ebfa140af 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -553,7 +553,6 @@ static CGSize kThreadListBarButtonItemImageSize;
     [self updateTopBanners];
     
     self.bubblesTableView.clipsToBounds = NO;
-    [self showToolbarContainerIfNeeded];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -603,7 +602,6 @@ static CGSize kThreadListBarButtonItemImageSize;
     
     // Stop the loading indicator even if the session is still in progress
     [self stopLoadingUserIndicator];
-    [self hideToolbarContainerIfNeeded];
 }
 
 - (void)viewDidAppear:(BOOL)animated
@@ -1213,7 +1211,6 @@ static CGSize kThreadListBarButtonItemImageSize;
     if (!self.inputToolbarView || ![self.inputToolbarView isMemberOfClass:roomInputToolbarViewClass])
     {
         [super setRoomInputToolbarViewClass:roomInputToolbarViewClass];
-        [self moveToolbarContainerIfNeeded];
         if ([self.inputToolbarView.class conformsToProtocol:@protocol(RoomInputToolbarViewProtocol)]) {
             id<RoomInputToolbarViewProtocol> inputToolbar = (id<RoomInputToolbarViewProtocol>)self.inputToolbarView;
             [inputToolbar setVoiceMessageToolbarView:self.voiceMessageController.voiceMessageToolbarView];
diff --git a/Riot/Modules/Room/RoomViewController.swift b/Riot/Modules/Room/RoomViewController.swift
index 09bfb683c..2ba0bd078 100644
--- a/Riot/Modules/Room/RoomViewController.swift
+++ b/Riot/Modules/Room/RoomViewController.swift
@@ -150,27 +150,19 @@ extension RoomViewController {
         }
     }
     
-    @objc func moveToolbarContainerIfNeeded() {
-        if inputToolbarView is WysiwygInputToolbarView,
-           let container = roomInputToolbarContainer,
+    @objc func didChangeMaximisedState(_ state: Bool) {
+        if state,
+           roomInputToolbarContainer.superview == self.view,
            let view = UIApplication.shared.windows.first(where: { $0.isKeyWindow }) {
-            
-            view.addSubview(container)
-            container.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor).isActive = true
-            container.rightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.rightAnchor).isActive = true
-            container.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
-        }
-    }
-    
-    @objc func showToolbarContainerIfNeeded() {
-        if inputToolbarView is WysiwygInputToolbarView {
-            roomInputToolbarContainer.isHidden = false
-        }
-    }
-    
-    @objc func hideToolbarContainerIfNeeded() {
-        if inputToolbarView is WysiwygInputToolbarView {
-            roomInputToolbarContainer.isHidden = true
+            roomInputToolbarContainer.removeFromSuperview()
+            view.addSubview(roomInputToolbarContainer)
+            roomInputToolbarContainer.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor).isActive = true
+            roomInputToolbarContainer.rightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.rightAnchor).isActive = true
+            roomInputToolbarContainer.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
+        } else if roomInputToolbarContainer.superview != self.view {
+            roomInputToolbarContainer.removeFromSuperview()
+            self.view.addSubview(roomInputToolbarContainer)
+            NSLayoutConstraint.activate(toolbarContainerConstraints)
         }
     }
 }
diff --git a/Riot/Modules/Room/RoomViewController.xib b/Riot/Modules/Room/RoomViewController.xib
index 073276604..181077ecf 100644
--- a/Riot/Modules/Room/RoomViewController.xib
+++ b/Riot/Modules/Room/RoomViewController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -35,6 +35,13 @@
                 <outlet property="userSuggestionContainerHeightConstraint" destination="1Cd-cT-gOr" id="au5-3q-r54"/>
                 <outlet property="userSuggestionContainerView" destination="oni-F4-X1U" id="0js-Ji-8Mm"/>
                 <outlet property="view" destination="iN0-l3-epB" id="ieV-u7-rXU"/>
+                <outletCollection property="toolbarContainerConstraints" destination="T1Y-r9-bYV" id="wax-9P-KGn"/>
+                <outletCollection property="toolbarContainerConstraints" destination="ave-fu-X1D" id="gBl-7F-srT"/>
+                <outletCollection property="toolbarContainerConstraints" destination="omU-sm-3bK" id="jsf-Rd-Jdl"/>
+                <outletCollection property="toolbarContainerConstraints" destination="pRw-S0-6WL" id="q4S-0g-sqQ"/>
+                <outletCollection property="toolbarContainerConstraints" destination="QO8-nF-xys" id="aQe-20-4Pq"/>
+                <outletCollection property="toolbarContainerConstraints" destination="acJ-g8-R7x" id="uEo-Ez-seV"/>
+                <outletCollection property="toolbarContainerConstraints" destination="5eD-Fm-RDb" id="6YJ-n9-Bic"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h
index 4bdea353b..08357ebe5 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.h
@@ -75,6 +75,8 @@ typedef NS_ENUM(NSUInteger, RoomInputToolbarViewSendMode)
  */
 - (void)roomInputToolbarView:(RoomInputToolbarView *)toolbarView sendAttributedTextMessage:(NSAttributedString *)attributedTextMessage;
 
+- (void)didChangeMaximisedState: (BOOL) state;
+
 @end
 
 /**
diff --git a/Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift b/Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
index 112056d01..ad2844bb4 100644
--- a/Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
+++ b/Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
@@ -111,6 +111,12 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
                 .removeDuplicates()
                 .sink { [weak hostingViewController] _ in
                     hostingViewController?.view.setNeedsLayout()
+                },
+            
+            wysiwygViewModel.$maximised
+                .removeDuplicates()
+                .sink { [weak self] value in
+                    self?.toolbarViewDelegate?.didChangeMaximisedState(value)
                 }
         ]