diff --git a/src/templates/main-table.html b/src/templates/main-table.html
index bc5a5ad3..385d3c63 100644
--- a/src/templates/main-table.html
+++ b/src/templates/main-table.html
@@ -43,8 +43,9 @@
                 {{ fileNavigator.error }}
             </td>
         </tr>
-        <tr class="item-list" ng-repeat="item in $parent.fileList = (fileNavigator.fileList | filter: {model:{name: query}} | orderBy:predicate:reverse)" ng-show="!fileNavigator.requesting" ng-click="selectOrUnselect(item, $event)" ng-dblclick="smartClick(item)" ng-right-click="selectOrUnselect(item, $event)" ng-class="{selected: isSelected(item)}">
-            <td>
+        <tr class="item-list" ng-repeat="item in $parent.fileList = (fileNavigator.fileList | filter: {model:{name: query}} | orderBy:predicate:reverse)" ng-show="!fileNavigator.requesting" ng-click="selectOrUnselect(item, $event)" ng-dblclick="smartClick(item)" ng-right-click="selectOrUnselect(item, $event)" ng-class="{selected: isSelected(item)}" x-lvl-drop-target="{{item.model.type === 'dir'}}"
+            x-on-drop="dropped(dragEl, dropEl, item)" >
+            <td x-lvl-draggable="{{item.model.type !== 'syncgroup'}}">
                 <a href="" title="{{item.model.name}} ({{item.model.size | humanReadableFileSize}})">
                     <i class="glyphicon glyphicon-folder-close" ng-show="item.model.type === 'dir'"></i>
                     <i class="glyphicon glyphicon-file" ng-show="item.model.type === 'file'"></i>
diff --git a/src/templates/main.html b/src/templates/main.html
index affb6c84..e251d315 100644
--- a/src/templates/main.html
+++ b/src/templates/main.html
@@ -1,7 +1,7 @@
 <div ng-controller="FileManagerCtrl" ngf-drop="addForUpload($files)" ngf-drag-over-class="'upload-dragover'" ngf-multiple="true">
     <div ng-include="config.tplPath + '/navbar.html'"></div>
 
-    <div class="container-fluid">
+    <div class="container-fluid" x-lvl-drop-zone="true" x-on-drop="droppedFromDesktop(dragEl, dropEl, dragFiles)">
         <div class="row">
 
             <div class="col-sm-4 col-md-3 sidebar file-tree animated slow fadeIn" ng-include="config.tplPath + '/sidebar.html'" ng-show="config.sidebar &amp;&amp; fileNavigator.history[0]">
diff --git a/src/templates/sidebar.html b/src/templates/sidebar.html
index 91154c82..370bebcc 100644
--- a/src/templates/sidebar.html
+++ b/src/templates/sidebar.html
@@ -3,7 +3,8 @@
 </ul>
 
 <script type="text/ng-template" id="folder-branch-item">
-    <a href="" ng-click="fileNavigator.folderClick(item.item)" class="animated fast fadeInDown">
+    <a href="" ng-click="fileNavigator.folderClick(item.item)" x-lvl-drop-target="true"
+       x-on-drop="dropped(dragEl, dropEl, item.item)" class="animated fast fadeInDown">
 
         <span class="point">
             <i class="glyphicon glyphicon-chevron-down" ng-show="isInThisPath(item.name)"></i>