diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index e51f33a8c..25e6558ca 100644
--- a/rtdata/languages/English (US)	
+++ b/rtdata/languages/English (US)	
@@ -256,6 +256,8 @@ MAIN_BUTTON_QUEUE;Put to queue
 MAIN_BUTTON_SAVE;Save Image
 MAIN_BUTTON_SAVEAS;As...
 MAIN_BUTTON_SENDTOEDITOR;Send to editor
+MAIN_BUTTON_FULLSCREEN;Fullscreen
+MAIN_BUTTON_UNFULLSCREEN;Exit fullscreen
 MAIN_FRAME_BATCHQUEUE;Batch Queue 
 MAIN_FRAME_FILEBROWSER;File Browser 
 MAIN_FRAME_PLACES;Places 
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index 9c4922c5d..c165add4d 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -72,13 +72,19 @@ RTWindow::RTWindow () {
     mainBox->pack_start (*mainNB);   
     Gtk::HBox* bottomBox = Gtk::manage (new Gtk::HBox ());
     mainBox->pack_start (*bottomBox, Gtk::PACK_SHRINK, 1);
+
+    // filling bottom box
     Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com"));
     Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")));
     preferences->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-preferences"), Gtk::ICON_SIZE_BUTTON)));
     preferences->set_relief (Gtk::RELIEF_NONE);
     preferences->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::showPreferences) );
+    btn_fullscreen = Gtk::manage( new Gtk::Button(M("MAIN_BUTTON_FULLSCREEN")));
+    btn_fullscreen->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::toggle_fullscreen) );
     bottomBox->pack_start (*preferences, Gtk::PACK_SHRINK, 0);
     bottomBox->pack_start (*rtWeb, Gtk::PACK_SHRINK, 4);
+    bottomBox->pack_end (*btn_fullscreen, Gtk::PACK_SHRINK, 4);
+
     Glib::RefPtr<Gtk::RcStyle> style = Gtk::RcStyle::create ();
     style->set_xthickness (0);
     style->set_ythickness (0);    
@@ -145,14 +151,7 @@ void RTWindow::remEditorPanel (EditorPanel* ep) {
 
 bool RTWindow::keyPressed (GdkEventKey* event) {
     if(event->keyval == GDK_F11) {
-        if(is_fullscreen){
-            unfullscreen();
-            is_fullscreen = false;
-        }
-        else {
-            fullscreen();
-            is_fullscreen = true;
-        }
+        toggle_fullscreen();
     }
 
     if (mainNB->get_nth_page (mainNB->get_current_page()) == fpanel) {
@@ -232,4 +231,15 @@ void RTWindow::showPreferences () {
   fpanel->optionsChanged ();
 }
 
-
+void RTWindow::toggle_fullscreen () {
+    if(is_fullscreen){
+        unfullscreen();
+        is_fullscreen = false;
+        btn_fullscreen->set_label(M("MAIN_BUTTON_FULLSCREEN"));
+    }
+    else {
+        fullscreen();
+        is_fullscreen = true;
+        btn_fullscreen->set_label(M("MAIN_BUTTON_UNFULLSCREEN"));
+    }
+}
diff --git a/rtgui/rtwindow.h b/rtgui/rtwindow.h
index 884568cde..e69ee3ff8 100644
--- a/rtgui/rtwindow.h
+++ b/rtgui/rtwindow.h
@@ -35,6 +35,7 @@ class RTWindow : public Gtk::Window {
         std::map<Glib::ustring, EditorPanel*> epanels;
         
         bool is_fullscreen;
+        Gtk::Button * btn_fullscreen;
         
     public:
         RTWindow ();
@@ -50,6 +51,7 @@ class RTWindow : public Gtk::Window {
         void imageDeveloped (Glib::ustring fname); // called by the batchqueue when it finishes an image
         void showPreferences ();
         void on_realize ();
+        void toggle_fullscreen ();
 };
 
 #endif