diff --git a/Riot/ViewController/RoomViewController.m b/Riot/ViewController/RoomViewController.m
index 7ffe4f630..cd5483a15 100644
--- a/Riot/ViewController/RoomViewController.m
+++ b/Riot/ViewController/RoomViewController.m
@@ -2886,7 +2886,7 @@
                                                        initForMXSession:self.roomDataSource.mxSession
                                                        inRoom:self.roomDataSource.roomId
                                                        screen:[IntegrationManagerViewController screenForWidget:kWidgetTypeStickerPicker]
-                                                       widgetId:kWidgetTypeStickerPicker];
+                                                       widgetId:nil];
 
         [self presentViewController:modularVC animated:NO completion:nil];
     }
diff --git a/Riot/ViewController/Widgets/StickerPickerViewController.m b/Riot/ViewController/Widgets/StickerPickerViewController.m
index 80609ecb4..c4270bddc 100644
--- a/Riot/ViewController/Widgets/StickerPickerViewController.m
+++ b/Riot/ViewController/Widgets/StickerPickerViewController.m
@@ -52,7 +52,7 @@
                                                    initForMXSession:self.roomDataSource.mxSession
                                                    inRoom:self.roomDataSource.roomId
                                                    screen:[IntegrationManagerViewController screenForWidget:kWidgetTypeStickerPicker]
-                                                   widgetId:kWidgetTypeStickerPicker];
+                                                   widgetId:self.widget.widgetId];
 
     [self presentViewController:modularVC animated:NO completion:nil];
 }
diff --git a/Riot/ViewController/Widgets/WidgetViewController.h b/Riot/ViewController/Widgets/WidgetViewController.h
index 0f9a70685..70c280c93 100644
--- a/Riot/ViewController/Widgets/WidgetViewController.h
+++ b/Riot/ViewController/Widgets/WidgetViewController.h
@@ -27,6 +27,11 @@
  */
 @interface WidgetViewController : WebViewViewController
 
+/**
+ The displayed widget.
+ */
+@property (nonatomic, readonly) Widget  *widget;
+
 /**
  The room data source.
  Required if the widget needs to post messages.
diff --git a/Riot/ViewController/Widgets/WidgetViewController.m b/Riot/ViewController/Widgets/WidgetViewController.m
index aad876a52..e1440bc66 100644
--- a/Riot/ViewController/Widgets/WidgetViewController.m
+++ b/Riot/ViewController/Widgets/WidgetViewController.m
@@ -21,13 +21,11 @@
 NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse('%@', %@);";
 
 @interface WidgetViewController ()
-{
-    Widget  *widget;
-}
 
 @end
 
 @implementation WidgetViewController
+@synthesize widget;
 
 - (instancetype)initWithUrl:(NSString*)widgetUrl forWidget:(Widget*)theWidget
 {