diff --git a/README.md b/README.md
index 7b88321..09b069c 100644
--- a/README.md
+++ b/README.md
@@ -135,6 +135,12 @@ Alternatively you can run installation script with `-g` flag to auto install GNO
 
 	Use system theme icons instead of Adwaita icons included by theme.
 
+- **drag-window-headerbar-buttons.css**
+
+	Allow drag window from headerbar buttons *GNOMISH* **[BUGGED]**
+
+	It can activate button action, with unpleasant behavior.
+
 - **symbolic-tab-icons.css**
 
 	Make all tab icons look kinda like symbolic icons.
diff --git a/theme/drag-window-headerbar-buttons.css b/theme/drag-window-headerbar-buttons.css
new file mode 100644
index 0000000..a0c207c
--- /dev/null
+++ b/theme/drag-window-headerbar-buttons.css
@@ -0,0 +1,16 @@
+/* Allow drag window from headerbar buttons */
+
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+:root[tabsintitlebar] #nav-bar *,
+:root[tabsintitlebar] #titlebar .titlebar-button,
+:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
+	-moz-window-dragging: drag;
+}
+
+/* Avoid window dragging from urlbar */
+:root[tabsintitlebar] #nav-bar .urlbar-input-box, 
+:root[tabsintitlebar] #nav-bar .urlbar-input-box * {
+	-moz-window-dragging: no-drag !important;
+}
+
diff --git a/theme/parts/csd.css b/theme/parts/csd.css
index ff5a542..a1e1391 100644
--- a/theme/parts/csd.css
+++ b/theme/parts/csd.css
@@ -147,20 +147,6 @@
 	padding-bottom: 0 !important;
 }
 
-/* Allow window drag with headerbar buttons */
-:root[tabsintitlebar] #nav-bar *,
-:root[tabsintitlebar] #titlebar .titlebar-button,
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
-	-moz-window-dragging: drag;
-}
-
-:root[tabsintitlebar] #nav-bar .urlbar-input-box, 
-:root[tabsintitlebar] #nav-bar .urlbar-input-box *,
-#back-button,
-#forward-button{
-	-moz-window-dragging: no-drag !important;
-}
-
 /* FF 60 fixes */
 :root[tabsintitlebar] #titlebar[style="margin-bottom: -1px;"] {
     margin-bottom: -38px !important;
diff --git a/userChrome.css b/userChrome.css
index c46dad1..f814cc1 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -22,6 +22,10 @@
 /* Use system theme icons instead of Adwaita icons included by theme */
 /*@import "theme/system-icons.css"; /**/
 
+/* Allow drag window from headerbar buttons (GNOMISH) [BUGGED] 
+ * It can activate button action, with unpleasant behavior. */
+/*@import "theme/drag-window-headerbar-buttons.css"; /**/
+
 /* Make all tab icons look kinda like symbolic icons */
 /*@import "theme/symbolic-tab-icons.css"; /**/