diff --git a/js/components/preview/tags/details/tagDetailRow.js b/js/components/preview/tags/details/tagDetailRow.js
index 3cf1cf480..8a9a25f5e 100644
--- a/js/components/preview/tags/details/tagDetailRow.js
+++ b/js/components/preview/tags/details/tagDetailRow.js
@@ -150,7 +150,8 @@ const TagDetailRow = memo(({ tag, moleculesToEditIds, moleculesToEdit }) => {
           tag={tag}
           selected={selectedTagList.some(i => i.id === tag.id)}
           handleClick={handleTagClick}
-          disabled={!DJANGO_CONTEXT.pk}
+          // disabled={!DJANGO_CONTEXT.pk}
+          disabled={false}
           isEdit={true}
           isTagEditor={true}
         ></TagView>
diff --git a/js/components/preview/tags/modal/tagEditor.js b/js/components/preview/tags/modal/tagEditor.js
index b5ac53524..bcf0b8a37 100644
--- a/js/components/preview/tags/modal/tagEditor.js
+++ b/js/components/preview/tags/modal/tagEditor.js
@@ -1,18 +1,10 @@
 import React, { forwardRef, memo } from 'react';
-import {
-  Grid,
-  Popper,
-  IconButton,
-  Tooltip,
-  makeStyles
-} from '@material-ui/core';
+import { Grid, Popper, IconButton, Tooltip, makeStyles } from '@material-ui/core';
 import { Panel } from '../../../common';
 import { Close } from '@material-ui/icons';
 import { useDispatch, useSelector } from 'react-redux';
 import { updateMoleculeInMolLists, updateMoleculeTag } from '../../../../reducers/api/actions';
-import {
-  getMoleculeForId
-} from '../redux/dispatchActions';
+import { getMoleculeForId } from '../redux/dispatchActions';
 import { setMoleculeForTagEdit, setIsTagGlobalEdit } from '../../../../reducers/selection/actions';
 import { updateExistingTag } from '../api/tagsApi';
 import { DJANGO_CONTEXT } from '../../../../utils/djangoContext';
@@ -201,7 +193,7 @@ export const TagEditor = memo(
           ]}
         >
           <Grid>
-            <TagCategory tagClickCallback={handleTagClick} />
+            <TagCategory tagClickCallback={handleTagClick} disabled={!DJANGO_CONTEXT.pk} />
           </Grid>
         </Panel>
       </Popper>
diff --git a/js/components/preview/tags/tagCategory.js b/js/components/preview/tags/tagCategory.js
index 09f993013..0a78a2298 100644
--- a/js/components/preview/tags/tagCategory.js
+++ b/js/components/preview/tags/tagCategory.js
@@ -15,7 +15,7 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
-const TagCategory = memo(({ headerPadding = 0, tagClickCallback }) => {
+const TagCategory = memo(({ headerPadding = 0, tagClickCallback, disabled = false }) => {
   const classes = useStyles();
 
   const categoryList = useSelector(state => state.selectionReducers.categoryList);
@@ -37,17 +37,17 @@ const TagCategory = memo(({ headerPadding = 0, tagClickCallback }) => {
   return (
     <>
       <Grid className={classes.category} style={{ paddingRight: headerPadding + 'px' }}>
-        <TagCategoryView name={CATEGORY_TYPE.SITE} />
-        <TagCategoryView name={CATEGORY_TYPE.SERIES} />
-        <TagCategoryView name={CATEGORY_TYPE.FORUM} />
-        <TagCategoryView name={CATEGORY_TYPE.OTHER} />
+        <TagCategoryView name={CATEGORY_TYPE.SITE} disabled={disabled} />
+        <TagCategoryView name={CATEGORY_TYPE.SERIES} disabled={disabled} />
+        <TagCategoryView name={CATEGORY_TYPE.FORUM} disabled={disabled} />
+        <TagCategoryView name={CATEGORY_TYPE.OTHER} disabled={disabled} />
       </Grid>
 
       <Grid className={classes.categoryScrollable}>
-        <TagCategoryView tags={siteTags} clickCallback={tagClickCallback} />
-        <TagCategoryView tags={seriesTags} clickCallback={tagClickCallback} />
-        <TagCategoryView tags={forumTags} clickCallback={tagClickCallback} />
-        <TagCategoryView tags={otherTags} clickCallback={tagClickCallback} />
+        <TagCategoryView tags={siteTags} clickCallback={tagClickCallback} disabled={disabled} />
+        <TagCategoryView tags={seriesTags} clickCallback={tagClickCallback} disabled={disabled} />
+        <TagCategoryView tags={forumTags} clickCallback={tagClickCallback} disabled={disabled} />
+        <TagCategoryView tags={otherTags} clickCallback={tagClickCallback} disabled={disabled} />
       </Grid>
     </>
   );
diff --git a/js/components/preview/tags/tagCategoryView.js b/js/components/preview/tags/tagCategoryView.js
index f9e7f78f3..40b9a8e88 100644
--- a/js/components/preview/tags/tagCategoryView.js
+++ b/js/components/preview/tags/tagCategoryView.js
@@ -29,7 +29,7 @@ const useStyles = makeStyles(theme => ({
  *  -if is- behaves as Assign tag element and assignes tags to hits
  *  -if is NOT- behaves as Hit filter element and filters hits in Hit navigator
  */
-const TagCategoryView = memo(({ name, tags, specialTags, clickCallback }) => {
+const TagCategoryView = memo(({ name, tags, specialTags, clickCallback, disabled = false }) => {
   const classes = useStyles();
   const selectedTagList = useSelector(state => state.selectionReducers.selectedTagList);
   const dispatch = useDispatch();
@@ -42,7 +42,12 @@ const TagCategoryView = memo(({ name, tags, specialTags, clickCallback }) => {
     moleculesToEditIds = [];
     moleculesToEditIds.push(molId);
   }
-  const moleculesToEdit = moleculesToEditIds && moleculesToEditIds.length > 0 && !(moleculesToEditIds.length === 1 && moleculesToEditIds[0] === null) ? moleculesToEditIds.map(id => dispatch(getMoleculeForId(id))) : [];
+  const moleculesToEdit =
+    moleculesToEditIds &&
+    moleculesToEditIds.length > 0 &&
+    !(moleculesToEditIds.length === 1 && moleculesToEditIds[0] === null)
+      ? moleculesToEditIds.map(id => dispatch(getMoleculeForId(id)))
+      : [];
 
   const handleTagClick = (selected, tag, allTags) => {
     if (clickCallback !== undefined) {
@@ -91,6 +96,7 @@ const TagCategoryView = memo(({ name, tags, specialTags, clickCallback }) => {
                     tag={tag}
                     selected={clickCallback !== undefined ? isTagSelected(tag) : selected}
                     handleClick={handleTagClick}
+                    disabled={disabled}
                   ></TagView>
                 );
               })}
diff --git a/js/components/preview/tags/tagView.js b/js/components/preview/tags/tagView.js
index e7ce33193..db88b4aab 100644
--- a/js/components/preview/tags/tagView.js
+++ b/js/components/preview/tags/tagView.js
@@ -98,11 +98,12 @@ const TagView = memo(
     const isTagDisabled = false;
 
     const determineDisabled = () => {
-      let result = false;
-      if (isEdit && disabled) {
-        result = true;
-      }
-      return result;
+      // let result = false;
+      // if (isEdit && disabled) {
+      //   result = true;
+      // }
+      // return result;
+      return disabled;
     };
 
     const handleDelete = () => {
diff --git a/package.json b/package.json
index f1522614d..3b18a8a49 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fragalysis-frontend",
-  "version": "0.10.55",
+  "version": "0.10.56",
   "description": "Frontend for fragalysis",
   "main": "webpack.config.js",
   "scripts": {