diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 4c77eacf..ba3af0d9 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -129,3 +129,8 @@ void ResizeToCmd::real_execute() {
     if (m_step_size_x > 0 && m_step_size_y > 0)
         fbwindow().resize(m_step_size_x, m_step_size_y);
 }
+
+FullscreenCmd::FullscreenCmd() { }
+void FullscreenCmd::real_execute() {
+    fbwindow().setFullscreen(!fbwindow().isFullscreen());
+}
diff --git a/src/CurrentWindowCmd.hh b/src/CurrentWindowCmd.hh
index 2192cc20..6e175664 100644
--- a/src/CurrentWindowCmd.hh
+++ b/src/CurrentWindowCmd.hh
@@ -154,4 +154,11 @@ private:
   const int m_step_size_x;
   const int m_step_size_y;
 };
+
+class FullscreenCmd: public WindowHelperCmd{
+public:
+    explicit FullscreenCmd();
+protected:
+    void real_execute();
+};
 #endif // CURRENTWINDOWCMD_HH
diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc
index 86f9eff5..8279edb6 100644
--- a/src/FbCommandFactory.cc
+++ b/src/FbCommandFactory.cc
@@ -63,6 +63,7 @@ FbCommandFactory::FbCommandFactory() {
         "focusdown",
         "focusleft",
         "focusright",
+        "fullscreen",
         "iconify",
         "killwindow",
         "leftworkspace",
@@ -208,6 +209,8 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
     //
     // Current focused window commands
     //
+    else if (command == "fullscreen")
+        return new FullscreenCmd();
     else if (command == "minimizewindow" || command == "minimize" || command == "iconify")
         return new CurrentWindowCmd(&FluxboxWindow::iconify);
     else if (command == "maximizewindow" || command == "maximize")