diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2279181bba..2727797286 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -234,6 +234,7 @@
 #include "llfloaterreg.h"
 #include "llfloatersimplesnapshot.h"
 #include "llfloatersnapshot.h"
+#include "llfloaterflickr.h"
 #include "llsidepanelinventory.h"
 #include "llatmosphere.h"
 
@@ -1749,6 +1750,7 @@ bool LLAppViewer::doFrame()
                     gPipeline.mReflectionMapManager.update();
                     LLFloaterSnapshot::update(); // take snapshots
                     LLFloaterSimpleSnapshot::update();
+                    LLFloaterFlickr::update(); // <FS:Beq/> FIRE-35002 - Flickr preview not updating whne opened directly from tool tray icon
                     gGLActive = false;
                 }
 
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 64d0c9c935..196defda1f 100644
--- a/indra/newview/llfloaterflickr.cpp
+++ b/indra/newview/llfloaterflickr.cpp
@@ -27,6 +27,7 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llfloatersnapshot.h" // <FS:Beq/> Fix share to flickr preview again
 #include "llfloaterflickr.h"
 
 #include "llagent.h"
@@ -243,7 +244,16 @@ void LLFlickrPhotoPanel::draw()
     // Draw the rest of the panel on top of it
     LLPanel::draw();
 }
-
+// <FS:Beq> FIRE-35002 - Flickr preview not updating whne opened directly from tool tray icon
+//static
+void LLFloaterFlickr::update()
+{
+    if (LLFloaterReg::instanceVisible("flickr"))
+    {
+        LLFloaterSnapshotBase::ImplBase::updatePreviewList( true, true );        
+    }
+}
+// </FS:Beq>
 LLSnapshotLivePreview* LLFlickrPhotoPanel::getPreviewView()
 {
     LLSnapshotLivePreview* previewp = (LLSnapshotLivePreview*)mPreviewHandle.get();
diff --git a/indra/newview/llfloaterflickr.h b/indra/newview/llfloaterflickr.h
index e0579ba870..d24f6ec97f 100644
--- a/indra/newview/llfloaterflickr.h
+++ b/indra/newview/llfloaterflickr.h
@@ -136,6 +136,7 @@ public:
     void onOpen(const LLSD& key);
     LLSnapshotLivePreview* getPreviewView(); // <FS:Beq/> Required for snapshot frame rendering
 
+    static void update(); // <FS:Beq/> FIRE-35002 - Flickr preview not updating whne opened directly from tool tray icon
 private:
     LLFlickrPhotoPanel* mFlickrPhotoPanel;
     LLTextBox* mStatusErrorText;